From b4201a0054369a8cd89e940947fd6f1a89f357c2 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 02 八月 2023 13:38:24 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 docs/swagger.yaml |  499 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 462 insertions(+), 37 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index cc6e9dd..26faa50 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -450,6 +450,31 @@
       title:
         type: string
     type: object
+  model.OrderManage:
+    properties:
+      client:
+        $ref: '#/definitions/model.Client'
+      clientId:
+        type: integer
+      contactId:
+        type: integer
+      file:
+        type: string
+      id:
+        type: integer
+      name:
+        type: string
+      number:
+        type: string
+      orderType:
+        type: integer
+      problemDescription:
+        type: string
+      reportSourceId:
+        type: integer
+      sourceSheet:
+        type: integer
+    type: object
   model.OrderType:
     properties:
       id:
@@ -712,6 +737,12 @@
         type: string
       id:
         type: integer
+      logisticCompany:
+        type: string
+      logisticCost:
+        type: number
+      logisticNumber:
+        type: string
       memberId:
         type: integer
       number:
@@ -1770,6 +1801,15 @@
     - vettingId
     - vettingType
     type: object
+  request.Assign:
+    properties:
+      id:
+        type: integer
+      member_id:
+        type: integer
+      type:
+        type: string
+    type: object
   request.CasbinInfo:
     properties:
       method:
@@ -1858,6 +1898,13 @@
         description: 寰俊鍙�
         type: string
     type: object
+  request.DeleteClient:
+    properties:
+      ids:
+        items:
+          type: integer
+        type: array
+    type: object
   request.DeleteCountry:
     properties:
       id:
@@ -1900,6 +1947,193 @@
         type: integer
       topic:
         type: string
+    type: object
+  request.GetClientList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetContactList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetContractList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetFollowRecordList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetMasterOrderList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetOrderManageList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetPlanList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetQuotationList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetSaleChanceList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetSalesDetailsList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetSalesLeadsList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetSalesRefundList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetSalesReturnList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetServiceContractList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetServiceFeeManageList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetServiceFollowupList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+    type: object
+  request.GetSubOrderList:
+    properties:
+      keyword:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
     type: object
   request.GetUserList:
     properties:
@@ -1991,6 +2225,12 @@
       conditions:
         type: string
       deliveryDate:
+        type: string
+      logisticCompany:
+        type: string
+      logisticCost:
+        type: number
+      logisticNumber:
         type: string
       memberId:
         type: integer
@@ -3285,6 +3525,8 @@
     type: object
   response.ClientResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.Client'
@@ -3306,6 +3548,8 @@
     type: object
   response.ContactResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.ContactDetail'
@@ -3313,6 +3557,8 @@
     type: object
   response.ContractResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.Contract'
@@ -3533,6 +3779,8 @@
     type: object
   response.FollowRecordResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.FollowRecord'
@@ -3570,6 +3818,8 @@
     type: object
   response.MasterOrderResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.MasterOrder'
@@ -3580,6 +3830,15 @@
       list:
         items:
           $ref: '#/definitions/model.Menu'
+        type: array
+    type: object
+  response.OrderManageResponse:
+    properties:
+      count:
+        type: integer
+      list:
+        items:
+          $ref: '#/definitions/model.OrderManage'
         type: array
     type: object
   response.OrderTypeResponse:
@@ -3601,6 +3860,8 @@
     type: object
   response.PlanResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.Plan'
@@ -3622,6 +3883,8 @@
     type: object
   response.QuotationResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.Quotation'
@@ -3671,6 +3934,8 @@
     type: object
   response.SaleChanceResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.SaleChance'
@@ -3692,6 +3957,8 @@
     type: object
   response.SalesDetailsResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.SalesDetails'
@@ -3699,6 +3966,8 @@
     type: object
   response.SalesLeadsResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.SalesLeads'
@@ -3706,6 +3975,8 @@
     type: object
   response.SalesRefundResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.SalesRefund'
@@ -3713,6 +3984,8 @@
     type: object
   response.SalesReturnResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.SalesReturn'
@@ -3755,6 +4028,8 @@
     type: object
   response.ServiceContractsResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.ServiceContract'
@@ -3762,6 +4037,8 @@
     type: object
   response.ServiceFeeManageResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.ServiceFeeManage'
@@ -3769,6 +4046,8 @@
     type: object
   response.ServiceFollowupResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.ServiceFollowup'
@@ -3783,6 +4062,8 @@
     type: object
   response.SubOrderResponse:
     properties:
+      count:
+        type: integer
       list:
         items:
           $ref: '#/definitions/model.SubOrder'
@@ -3876,6 +4157,25 @@
       summary: 鏇存柊璐︽埛
       tags:
       - AccountId
+  /api/assign/assign:
+    post:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.Assign'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 瀹℃牳
+      tags:
+      - Assign
   /api/authority/add:
     post:
       consumes:
@@ -4079,14 +4379,15 @@
       summary: 娣诲姞瀹㈡埛
       tags:
       - Client
-  /api/client/delete/{id}:
+  /api/client/delete:
     delete:
       parameters:
-      - description: 瀹㈡埛ID
-        in: path
-        name: id
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
         required: true
-        type: integer
+        schema:
+          $ref: '#/definitions/request.DeleteClient'
       produces:
       - application/json
       responses:
@@ -4098,7 +4399,14 @@
       tags:
       - Client
   /api/client/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetClientList'
       produces:
       - application/json
       responses:
@@ -4111,7 +4419,7 @@
                 data:
                   $ref: '#/definitions/response.ClientResponse'
               type: object
-      summary: 鑾峰彇瀹㈡埛鍒楄〃
+      summary: 瀹㈡埛鍒楄〃
       tags:
       - Client
   /api/client/update:
@@ -4463,7 +4771,14 @@
       tags:
       - Contact
   /api/contact/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetContactList'
       produces:
       - application/json
       responses:
@@ -4536,7 +4851,14 @@
       tags:
       - Contract
   /api/contract/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetContractList'
       produces:
       - application/json
       responses:
@@ -4549,7 +4871,7 @@
                 data:
                   $ref: '#/definitions/response.ContractResponse'
               type: object
-      summary: 鑾峰彇鍚堝悓鍒楄〃
+      summary: 閿�鍞悎鍚屽垪琛�
       tags:
       - Contract
   /api/contract/update:
@@ -5060,7 +5382,14 @@
       tags:
       - FollowRecord
   /api/followRecord/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetFollowRecordList'
       produces:
       - application/json
       responses:
@@ -5073,7 +5402,7 @@
                 data:
                   $ref: '#/definitions/response.FollowRecordResponse'
               type: object
-      summary: 鑾峰彇璺熻繘璁板綍鍒楄〃
+      summary: 鍥炶璁板綍鍒楄〃
       tags:
       - FollowRecord
   /api/followRecord/update:
@@ -5369,7 +5698,14 @@
       tags:
       - MasterOrder
   /api/masterOrder/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetMasterOrderList'
       produces:
       - application/json
       responses:
@@ -5382,7 +5718,7 @@
                 data:
                   $ref: '#/definitions/response.MasterOrderResponse'
               type: object
-      summary: 涓昏鍗曞垪琛�
+      summary: 閿�鍞�诲崟鍒楄〃
       tags:
       - MasterOrder
   /api/masterOrder/update:
@@ -5467,15 +5803,27 @@
       tags:
       - OrderManage
   /api/orderManage/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetOrderManageList'
       produces:
       - application/json
       responses:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/contextx.Response'
-      summary: 宸ュ崟鍒楄〃
+            allOf:
+            - $ref: '#/definitions/contextx.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/response.OrderManageResponse'
+              type: object
+      summary: 宸ュ崟绠＄悊鍒楄〃
       tags:
       - OrderManage
   /api/orderManage/update:
@@ -5608,7 +5956,14 @@
       tags:
       - Plan
   /api/plan/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetPlanList'
       produces:
       - application/json
       responses:
@@ -5621,7 +5976,7 @@
                 data:
                   $ref: '#/definitions/response.PlanResponse'
               type: object
-      summary: 鑾峰彇璁″垝鍒楄〃
+      summary: 鐢熸垚璁″垝鍒楄〃
       tags:
       - Plan
   /api/plan/update:
@@ -5852,7 +6207,14 @@
       tags:
       - Quotation
   /api/quotation/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetQuotationList'
       produces:
       - application/json
       responses:
@@ -6456,7 +6818,14 @@
       tags:
       - SaleChance
   /api/saleChance/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetSaleChanceList'
       produces:
       - application/json
       responses:
@@ -6469,7 +6838,7 @@
                 data:
                   $ref: '#/definitions/response.SaleChanceResponse'
               type: object
-      summary: 鑾峰彇閿�鍞満浼氬垪琛�
+      summary: 閿�鍞満浼氬垪琛�
       tags:
       - SaleChance
   /api/saleChance/update:
@@ -6675,7 +7044,14 @@
       tags:
       - SalesDetails
   /api/salesDetails/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetSalesDetailsList'
       produces:
       - application/json
       responses:
@@ -6688,7 +7064,7 @@
                 data:
                   $ref: '#/definitions/response.SalesDetailsResponse'
               type: object
-      summary: 鑾峰彇閿�鍞槑缁嗗垪琛�
+      summary: 閿�鍞槑缁嗗崟鍒楄〃
       tags:
       - SalesDetails
   /api/salesDetails/update:
@@ -6748,7 +7124,14 @@
       tags:
       - SalesLeads
   /api/salesLeads/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetSalesLeadsList'
       produces:
       - application/json
       responses:
@@ -6761,7 +7144,7 @@
                 data:
                   $ref: '#/definitions/response.SalesLeadsResponse'
               type: object
-      summary: 鑾峰彇閿�鍞嚎绱㈠垪琛�
+      summary: 閿�鍞嚎绱㈠垪琛�
       tags:
       - SalesLeads
   /api/salesLeads/update:
@@ -6821,7 +7204,14 @@
       tags:
       - SalesRefund
   /api/salesRefund/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetSalesRefundList'
       produces:
       - application/json
       responses:
@@ -6834,7 +7224,7 @@
                 data:
                   $ref: '#/definitions/response.SalesRefundResponse'
               type: object
-      summary: 閿�鍞��娆惧垪琛�
+      summary: 閿�鍞��娆惧崟鍒楄〃
       tags:
       - SalesRefund
   /api/salesRefund/update:
@@ -6894,7 +7284,14 @@
       tags:
       - SalesReturn
   /api/salesReturn/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetSalesReturnList'
       produces:
       - application/json
       responses:
@@ -6907,7 +7304,7 @@
                 data:
                   $ref: '#/definitions/response.SalesReturnResponse'
               type: object
-      summary: 鑾峰彇閿�鍞��璐у垪琛�
+      summary: 閿�鍞��璐у崟鍒楄〃
       tags:
       - SalesReturn
   /api/salesReturn/update:
@@ -7186,7 +7583,14 @@
       tags:
       - ServiceContract
   /api/serviceContract/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetServiceContractList'
       produces:
       - application/json
       responses:
@@ -7199,7 +7603,7 @@
                 data:
                   $ref: '#/definitions/response.ServiceContractsResponse'
               type: object
-      summary: 鏈嶅姟鍚堝悓鍒楄〃
+      summary: 鐢熸垚璁″垝鍒楄〃
       tags:
       - ServiceContract
   /api/serviceContract/update:
@@ -7405,7 +7809,14 @@
       tags:
       - ServiceFeeManage
   /api/serviceFeeManage/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetServiceFeeManageList'
       produces:
       - application/json
       responses:
@@ -7478,7 +7889,14 @@
       tags:
       - ServiceFollowup
   /api/serviceFollowup/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetServiceFollowupList'
       produces:
       - application/json
       responses:
@@ -7491,7 +7909,7 @@
                 data:
                   $ref: '#/definitions/response.ServiceFollowupResponse'
               type: object
-      summary: 鏈嶅姟璺熻繘鍒楄〃
+      summary: 鍥炶鍗曠鐞嗗垪琛�
       tags:
       - ServiceFollowup
   /api/serviceFollowup/update:
@@ -7692,7 +8110,14 @@
       tags:
       - SubOrder
   /api/subOrder/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetSubOrderList'
       produces:
       - application/json
       responses:
@@ -7705,7 +8130,7 @@
                 data:
                   $ref: '#/definitions/response.SubOrderResponse'
               type: object
-      summary: 鑾峰彇瀛愯鍗曞垪琛�
+      summary: 閿�鍞瓙鍗曞垪琛�
       tags:
       - SubOrder
   /api/subOrder/update:

--
Gitblit v1.8.0