From a86df1054649f0594e4c77174fd254b8abd800ca Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 15 八月 2023 11:22:10 +0800
Subject: [PATCH] fix

---
 docs/swagger.yaml |  786 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 702 insertions(+), 84 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index f9f1d1f..968a045 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -11,16 +11,30 @@
     type: string
     x-enum-varnames:
     - BankAccountQueryClassExpireLessThen60Days
-  constvar.CollectionStatus:
+  constvar.CollectionSourceType:
     enum:
     - 1
     - 2
     type: integer
     x-enum-comments:
+      CollectionSourceTypeSaleDetails: 閿�鍞槑缁�
+      CollectionSourceTypeServiceContract: 鏈嶅姟鍚堝悓
+    x-enum-varnames:
+    - CollectionSourceTypeSaleDetails
+    - CollectionSourceTypeServiceContract
+  constvar.CollectionStatus:
+    enum:
+    - 1
+    - 2
+    - 3
+    type: integer
+    x-enum-comments:
       CollectionStatusCollected: 宸叉敹娆�
+      CollectionStatusSubCollected: 閮ㄥ垎鏀舵
       CollectionStatusUnCollected: 寰呮敹娆�
     x-enum-varnames:
     - CollectionStatusUnCollected
+    - CollectionStatusSubCollected
     - CollectionStatusCollected
   constvar.CourierCompanyKeywordType:
     enum:
@@ -114,6 +128,28 @@
     type: string
     x-enum-varnames:
     - ReceiptQueryClassExpireLessThen60Days
+  constvar.ReceiptSourceType:
+    enum:
+    - 1
+    - 2
+    - 3
+    - 4
+    - 5
+    type: integer
+    x-enum-varnames:
+    - ReceiptSourceTypeSalesDetails
+    - ReceiptSourceTypeServiceContract
+    - ReceiptSourceTypeInvoice
+    - ReceiptSourceTypeCollectionPlan
+    - ReceiptSourceTypeChuKuDan
+  constvar.RefundSourceType:
+    enum:
+    - 1
+    type: integer
+    x-enum-comments:
+      RefundSourceTypeSalesReturn: 閿�鍞��璐�
+    x-enum-varnames:
+    - RefundSourceTypeSalesReturn
   constvar.SalesDetailsKeywordType:
     enum:
     - 瀹㈡埛鍚嶇О
@@ -128,6 +164,36 @@
     - SalesDetailsKeywordTypeSignTime
     - SalesDetailsKeywordTypePrincipal
     - SalesDetailsKeywordTypeProductName
+  constvar.SalesRefundKeywordType:
+    enum:
+    - 閿�鍞��璐у崟缂栧彿
+    - 瀹㈡埛鍚嶇О
+    - 閫�娆炬棩鏈�
+    - 璐︽埛
+    - 鏄惁寮�绁�
+    - 浠樻鏂瑰紡
+    - 閿�鍞礋璐ｄ汉
+    - 淇敼鏃堕棿
+    - 浠风◣鍚堣
+    type: string
+    x-enum-varnames:
+    - SalesRefundKeywordRefundNumber
+    - SalesRefundKeywordClientName
+    - SalesRefundKeywordRefundDate
+    - SalesRefundKeywordAccount
+    - SalesRefundKeywordIsInvoice
+    - SalesRefundKeywordPaymentType
+    - SalesRefundKeywordPrincipal
+    - SalesRefundKeywordUpdateAt
+    - SalesRefundKeywordPriceTotal
+  constvar.SalesReturnSourceType:
+    enum:
+    - 1
+    type: integer
+    x-enum-comments:
+      SalesReturnSourceTypeSaleDetails: 閿�鍞槑缁�
+    x-enum-varnames:
+    - SalesReturnSourceTypeSaleDetails
   constvar.SalesStatus:
     enum:
     - 0
@@ -238,6 +304,44 @@
     - ServiceFollowupKeywordCustomerServiceNo
     - ServiceFollowupKeywordVisitor
     - ServiceFollowupKeywordSatisfactionDegree
+  constvar.ServiceOrderKeywordType:
+    enum:
+    - 鏈嶅姟鍗曠紪鍙�
+    - 涓婚
+    - 瀹㈡埛鍚嶇О
+    - 瀹為檯澶勭悊鏃堕棿
+    - 鏈嶅姟浜哄憳
+    - 鏈嶅姟鏂瑰紡
+    - 浜у搧绫诲埆
+    - 鏁呴殰绫诲埆
+    type: string
+    x-enum-varnames:
+    - ServiceOrderKeywordOrderNumber
+    - ServiceOrderKeywordSubject
+    - ServiceOrderKeywordClientName
+    - ServiceOrderKeywordRealProcessTime
+    - ServiceOrderKeywordServiceMan
+    - ServiceOrderKeywordServiceType
+    - ServiceOrderKeywordProductType
+    - ServiceOrderKeywordFaultType
+  constvar.ServiceOrderQueryClass:
+    enum:
+    - ""
+    type: string
+    x-enum-varnames:
+    - ServiceOrderQueryClassExpireLessThen60Days
+  constvar.ServiceOrderStatusKeywordType:
+    enum:
+    - ""
+    type: string
+    x-enum-varnames:
+    - ServiceOrderStatusKeywordCustomerName
+  constvar.ServiceOrderStatusQueryClass:
+    enum:
+    - ""
+    type: string
+    x-enum-varnames:
+    - ServiceOrderStatusQueryClassExpireLessThen60Days
   constvar.UserType:
     enum:
     - 1
@@ -426,6 +530,39 @@
       name:
         type: string
     type: object
+  model.CollectionProjection:
+    properties:
+      _:
+        description: |-
+          The date when the item was deleted
+          example: 2023-08-10 15:48:25
+        type: string
+      created_at:
+        description: |-
+          The date when the item was created
+          example: 2023-08-10 15:48:25
+        type: string
+      creator:
+        type: integer
+      estimated_collection_amount:
+        type: number
+      estimated_collection_date:
+        type: string
+      id:
+        description: |-
+          The ID of the item
+          example: 1
+        type: integer
+      modifier:
+        type: integer
+      sale_chance_id:
+        type: integer
+      updated_at:
+        description: |-
+          The date when the item was last updated
+          example: 2023-08-10 15:48:25
+        type: string
+    type: object
   model.Contact:
     properties:
       birthday:
@@ -448,6 +585,8 @@
         type: integer
       is_first:
         type: boolean
+      member:
+        $ref: '#/definitions/model.User'
       member_id:
         type: integer
       name:
@@ -497,6 +636,8 @@
         type: integer
       is_first:
         type: boolean
+      member:
+        $ref: '#/definitions/model.User'
       member_id:
         type: integer
       name:
@@ -520,12 +661,29 @@
     type: object
   model.Contract:
     properties:
+      _:
+        description: |-
+          The date when the item was deleted
+          example: 2023-08-10 15:48:25
+        type: string
+      client:
+        $ref: '#/definitions/model.Client'
       clientId:
         type: integer
+      created_at:
+        description: |-
+          The date when the item was created
+          example: 2023-08-10 15:48:25
+        type: string
       file:
         type: string
       id:
+        description: |-
+          The ID of the item
+          example: 1
         type: integer
+      member:
+        $ref: '#/definitions/model.User'
       memberId:
         type: integer
       number:
@@ -536,6 +694,11 @@
         type: integer
       statusId:
         type: integer
+      updated_at:
+        description: |-
+          The date when the item was last updated
+          example: 2023-08-10 15:48:25
+        type: string
     type: object
   model.Country:
     properties:
@@ -561,23 +724,6 @@
         type: integer
       name:
         type: string
-    type: object
-  model.CustomerServiceSheet:
-    properties:
-      handleStatus:
-        type: integer
-      id:
-        type: integer
-      memberId:
-        type: integer
-      number:
-        type: string
-      priority:
-        type: integer
-      serviceFollowupId:
-        type: integer
-      serviceMode:
-        type: integer
     type: object
   model.Department:
     properties:
@@ -620,6 +766,8 @@
         $ref: '#/definitions/model.Client'
       client_id:
         type: integer
+      client_status:
+        $ref: '#/definitions/model.ClientStatus'
       client_status_id:
         type: integer
       contact:
@@ -646,8 +794,12 @@
         type: string
       record:
         type: string
+      sale_chance:
+        $ref: '#/definitions/model.SaleChance'
       sale_chance_id:
         type: integer
+      sales_leads:
+        $ref: '#/definitions/model.SalesLeads'
       sales_leads_id:
         type: integer
       topic:
@@ -752,6 +904,8 @@
         type: string
       id:
         type: integer
+      member:
+        $ref: '#/definitions/model.User'
       member_id:
         type: integer
       money:
@@ -903,10 +1057,18 @@
         type: string
       id:
         type: integer
+      member:
+        $ref: '#/definitions/model.User'
       member_id:
         type: integer
       number:
         type: string
+      products:
+        items:
+          $ref: '#/definitions/model.Product'
+        type: array
+      quotation_status:
+        $ref: '#/definitions/model.QuotationStatus'
       quotation_status_id:
         type: integer
       sale_chance:
@@ -925,6 +1087,11 @@
     type: object
   model.Receipt:
     properties:
+      amount:
+        description: 鏀舵閲戦
+        type: number
+      bankAccount:
+        $ref: '#/definitions/model.BankAccount'
       bankAccountId:
         description: 璐︽埛id
         type: integer
@@ -939,9 +1106,15 @@
       moneyType:
         description: 甯佺
         type: string
+      paymentType:
+        $ref: '#/definitions/model.PaymentType'
       paymentTypeId:
         description: 鏀舵鏂瑰紡ID
         type: integer
+      principal:
+        allOf:
+        - $ref: '#/definitions/model.User'
+        description: 璐熻矗浜篿d
       principalId:
         description: 璐熻矗浜篿d
         type: integer
@@ -955,8 +1128,9 @@
         description: 婧愬崟id
         type: integer
       sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.ReceiptSourceType'
         description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
-        type: integer
     type: object
   model.RefundMethod:
     properties:
@@ -1016,6 +1190,10 @@
         $ref: '#/definitions/model.Client'
       client_id:
         type: integer
+      collection_projections:
+        items:
+          $ref: '#/definitions/model.CollectionProjection'
+        type: array
       competitors:
         type: string
       contact:
@@ -1040,6 +1218,8 @@
         type: string
       key_maker:
         type: string
+      member:
+        $ref: '#/definitions/model.User'
       member_id:
         type: integer
       name:
@@ -1052,6 +1232,8 @@
         type: string
       possibilities_id:
         type: integer
+      possibility:
+        $ref: '#/definitions/model.Possibility'
       process:
         type: string
       projected_amount:
@@ -1064,18 +1246,24 @@
         $ref: '#/definitions/model.Region'
       region_id:
         type: integer
+      regular_customers:
+        $ref: '#/definitions/model.RegularCustomers'
       regular_customers_id:
         type: integer
       remark:
         type: string
+      sale_stage:
+        $ref: '#/definitions/model.SaleStage'
       sale_stage_id:
         type: integer
+      sale_type:
+        $ref: '#/definitions/model.SaleType'
       sale_type_id:
         type: integer
+      sales_sources:
+        $ref: '#/definitions/model.SalesSources'
       sales_sources_id:
         type: integer
-      salesSources:
-        $ref: '#/definitions/model.SalesSources'
       solutions:
         type: string
       status_id:
@@ -1101,6 +1289,8 @@
     type: object
   model.SalesDetails:
     properties:
+      Member:
+        $ref: '#/definitions/model.User'
       address:
         type: string
       addressee:
@@ -1114,6 +1304,9 @@
       amountReceived:
         description: 宸叉敹閲戦
         type: number
+      amountTotal:
+        description: 浠风◣鍚堣
+        type: number
       amountUnInvoiced:
         description: 鏈紑绁ㄩ噾棰�
         type: number
@@ -1122,6 +1315,12 @@
       clientId:
         type: integer
       conditions:
+        type: string
+      createTime:
+        type: string
+      creatorId:
+        type: integer
+      creatorName:
         type: string
       deliveryDate:
         type: string
@@ -1198,6 +1397,8 @@
         $ref: '#/definitions/model.Region'
       region_id:
         type: integer
+      sales_sources:
+        $ref: '#/definitions/model.SalesSources'
       sales_sources_id:
         type: integer
       sales_status:
@@ -1205,18 +1406,37 @@
     type: object
   model.SalesRefund:
     properties:
-      accountId:
+      amountTotal:
+        description: 浠风◣鍚堣
+        type: number
+      bankAccount:
+        $ref: '#/definitions/model.BankAccount'
+      bankAccountId:
+        description: 璐︽埛id
         type: integer
+      client:
+        $ref: '#/definitions/model.Client'
       clientId:
         type: integer
+      createTime:
+        type: string
+      creatorName:
+        type: string
       id:
         type: integer
       isInvoice:
         type: integer
+      member:
+        $ref: '#/definitions/model.User'
       memberId:
         type: integer
       number:
         type: string
+      paymentType:
+        $ref: '#/definitions/model.PaymentType'
+      paymentTypeId:
+        description: 鏀舵鏂瑰紡ID
+        type: integer
       products:
         items:
           $ref: '#/definitions/model.Product'
@@ -1225,13 +1445,30 @@
         type: string
       refundDate:
         type: string
-      refundMethod:
-        type: string
+      sourceId:
+        description: 婧愬崟id
+        type: integer
+      sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.RefundSourceType'
+        description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
     type: object
   model.SalesReturn:
     properties:
+      Member:
+        $ref: '#/definitions/model.User'
+      SalesReturnStatus:
+        allOf:
+        - $ref: '#/definitions/model.SalesReturnStatus'
+        description: 閫�璐х姸鎬�
+      client:
+        $ref: '#/definitions/model.Client'
       clientId:
         type: integer
+      createTime:
+        type: string
+      creatorName:
+        type: string
       id:
         type: integer
       memberId:
@@ -1239,17 +1476,28 @@
       number:
         type: string
       products:
+        description: 閫�璐т骇鍝�
         items:
           $ref: '#/definitions/model.Product'
         type: array
       reason:
+        description: 閫�璐у師鍥�
         type: string
       repository:
         type: string
       returnDate:
+        description: 閫�璐ф棩鏈�
         type: string
-      salesReturnStatus:
+      salesReturnStatusId:
+        description: 閫�璐х姸鎬乮d
         type: integer
+      sourceId:
+        description: 婧愬崟id
+        type: integer
+      sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.SalesReturnSourceType'
+        description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級
     type: object
   model.SalesReturnStatus:
     properties:
@@ -1276,6 +1524,15 @@
     properties:
       amount:
         description: 閲戦
+        type: number
+      amountReceivable:
+        description: 搴旀敹閲戦
+        type: number
+      amountReceived:
+        description: 宸叉敹閲戦
+        type: number
+      amountTotal:
+        description: 鎬婚
         type: number
       collectionDate:
         description: 璁″垝鏀舵鏃ユ湡
@@ -1304,12 +1561,13 @@
         description: 婧愬崟id
         type: integer
       sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.CollectionSourceType'
         description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁�2鏈嶅姟鍚堝悓3閿�鍞彂绁級
-        type: integer
       status:
         allOf:
         - $ref: '#/definitions/constvar.CollectionStatus'
-        description: 鐘舵�侊紙1鏈敹2宸叉敹锛�
+        description: 鐘舵�侊紙1鏈敹2閮ㄥ垎宸叉敹3宸叉敹锛�
       term:
         description: 鏈熸
         type: integer
@@ -1327,6 +1585,9 @@
       amountReceived:
         description: 宸叉敹閲戦
         type: number
+      amountTotal:
+        description: 浠风◣鍚堣
+        type: number
       amountUnInvoiced:
         description: 鏈紑绁ㄩ噾棰�
         type: number
@@ -1334,6 +1595,8 @@
         $ref: '#/definitions/model.Client'
       clientId:
         type: integer
+      contact:
+        $ref: '#/definitions/model.Contact'
       contactId:
         type: integer
       endTime:
@@ -1410,36 +1673,50 @@
     type: object
   model.ServiceFollowup:
     properties:
+      Member:
+        $ref: '#/definitions/model.User'
+      client:
+        $ref: '#/definitions/model.Client'
       clientId:
         type: integer
+      contact:
+        $ref: '#/definitions/model.Contact'
       contactId:
         type: integer
-      customerServiceSheet:
-        $ref: '#/definitions/model.CustomerServiceSheet'
       file:
         type: string
       id:
         type: integer
+      isVisit:
+        $ref: '#/definitions/model.IsVisit'
       isVisitId:
         type: integer
       memberId:
         type: integer
       number:
         type: string
+      oldMember:
+        $ref: '#/definitions/model.User'
       oldMemberId:
         type: integer
       planId:
         type: integer
       remark:
         type: string
+      satisfaction:
+        $ref: '#/definitions/model.Satisfaction'
       satisfactionId:
-        type: integer
-      serviceId:
         type: integer
       serviceOrder:
         $ref: '#/definitions/model.ServiceOrder'
+      serviceOrderId:
+        type: integer
+      solveRate:
+        $ref: '#/definitions/model.SolveRate'
       solveRateId:
         type: integer
+      timelyRate:
+        $ref: '#/definitions/model.TimelyRate'
       timelyRateId:
         type: integer
     type: object
@@ -1452,10 +1729,12 @@
         description: 棰勭害涓婇棬鏃堕棿
         type: string
       carFare:
-        description: 浜ら�氳垂
+        description: 浜ら�氳垂                                                                 //
+          浜ら�氳垂
         type: number
       chargeAmount:
-        description: 鏀惰垂閲戦
+        description: 鏀惰垂閲戦                                                       //
+          鏀惰垂閲戦
         type: number
       client:
         $ref: '#/definitions/model.Client'
@@ -1466,11 +1745,6 @@
         $ref: '#/definitions/model.Contact'
       contactId:
         description: 鑱旂郴浜篿d
-        type: integer
-      contract:
-        $ref: '#/definitions/model.Contract'
-      contractId:
-        description: 鍚堝悓id
         type: integer
       expectTime:
         description: 甯屾湜澶勭悊鏃堕棿
@@ -1487,11 +1761,6 @@
         type: integer
       id:
         type: integer
-      orderId:
-        description: 閿�鍞鍗昳d
-        type: integer
-      orderManage:
-        $ref: '#/definitions/model.OrderManage'
       priorityLevel:
         $ref: '#/definitions/model.PriorityLevel'
       priorityLevelId:
@@ -1516,12 +1785,27 @@
       saleChanceId:
         description: 閿�鍞満浼歩d
         type: integer
+      salesDetails:
+        $ref: '#/definitions/model.SalesDetails'
+      salesDetailsId:
+        description: 閿�鍞槑缁唅d
+        type: integer
+      serviceContract:
+        $ref: '#/definitions/model.ServiceContract'
+      serviceContractId:
+        description: 鏈嶅姟鍚堝悓id
+        type: integer
       serviceManId:
         description: 鏈嶅姟浜哄憳
         type: integer
       serviceNumber:
         description: 鏈嶅姟鍗曠紪鍙�
         type: string
+      serviceOrderStatus:
+        $ref: '#/definitions/model.ServiceOrderStatus'
+      serviceOrderStatusId:
+        description: 澶勭悊鐘舵��
+        type: integer
       serviceType:
         $ref: '#/definitions/model.ServiceType'
       serviceTypeId:
@@ -1535,9 +1819,6 @@
       solutionRemark:
         description: 鍐呴儴澶囨敞
         type: string
-      status:
-        description: 澶勭悊鐘舵��
-        type: integer
       subject:
         description: 涓婚
         type: string
@@ -1546,6 +1827,13 @@
       timeSpentId:
         description: 鑺辫垂鏃堕棿
         type: integer
+    type: object
+  model.ServiceOrderStatus:
+    properties:
+      id:
+        type: integer
+      name:
+        type: string
     type: object
   model.ServiceType:
     properties:
@@ -1583,8 +1871,12 @@
         type: integer
       id:
         type: integer
+      masterOrder:
+        $ref: '#/definitions/model.MasterOrder'
       masterOrderId:
         type: integer
+      member:
+        $ref: '#/definitions/model.User'
       memberId:
         type: integer
       number:
@@ -2122,6 +2414,10 @@
         type: integer
       number:
         type: string
+      products:
+        items:
+          $ref: '#/definitions/model.Product'
+        type: array
       quotation_status_id:
         type: integer
       sale_chance_id:
@@ -2138,6 +2434,11 @@
     type: object
   request.AddReceipt:
     properties:
+      amount:
+        description: 鏀舵閲戦
+        type: number
+      bankAccount:
+        $ref: '#/definitions/model.BankAccount'
       bankAccountId:
         description: 璐︽埛id
         type: integer
@@ -2152,9 +2453,15 @@
       moneyType:
         description: 甯佺
         type: string
+      paymentType:
+        $ref: '#/definitions/model.PaymentType'
       paymentTypeId:
         description: 鏀舵鏂瑰紡ID
         type: integer
+      principal:
+        allOf:
+        - $ref: '#/definitions/model.User'
+        description: 璐熻矗浜篿d
       principalId:
         description: 璐熻矗浜篿d
         type: integer
@@ -2168,8 +2475,9 @@
         description: 婧愬崟id
         type: integer
       sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.ReceiptSourceType'
         description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
-        type: integer
     type: object
   request.AddRefundMethod:
     properties:
@@ -2561,7 +2869,7 @@
         type: string
       satisfaction:
         type: integer
-      serviceId:
+      serviceOrderId:
         type: integer
       solveRate:
         type: integer
@@ -2588,9 +2896,6 @@
       contactId:
         description: 鑱旂郴浜篿d
         type: integer
-      contractId:
-        description: 鍚堝悓id
-        type: integer
       expectTime:
         description: 甯屾湜澶勭悊鏃堕棿
         type: string
@@ -2599,9 +2904,6 @@
         type: integer
       faultTypeId:
         description: 鏁呴殰绫诲埆id
-        type: integer
-      orderId:
-        description: 閿�鍞鍗昳d
         type: integer
       priorityLevelId:
         description: 浼樺厛绾у埆id
@@ -2621,12 +2923,21 @@
       saleChanceId:
         description: 閿�鍞満浼歩d
         type: integer
+      salesDetailsId:
+        description: 閿�鍞鍗昳d
+        type: integer
+      serviceContractId:
+        description: 鍚堝悓id
+        type: integer
       serviceManId:
         description: 鏈嶅姟浜哄憳
         type: integer
       serviceNumber:
         description: 鏈嶅姟鍗曠紪鍙�
         type: string
+      serviceOrderStatusId:
+        description: 澶勭悊鐘舵��
+        type: integer
       serviceTypeId:
         description: 鏈嶅姟鏂瑰紡id
         type: integer
@@ -2639,15 +2950,19 @@
       solutionRemark:
         description: 鍐呴儴澶囨敞
         type: string
-      status:
-        description: 澶勭悊鐘舵��
-        type: integer
       subject:
         description: 涓婚
         type: string
       timeSpentId:
         description: 鑺辫垂鏃堕棿
         type: integer
+    type: object
+  request.AddServiceOrderStatus:
+    properties:
+      id:
+        type: integer
+      name:
+        type: string
     type: object
   request.AddServiceType:
     properties:
@@ -2984,14 +3299,17 @@
     type: object
   request.GetContractList:
     properties:
-      keyword:
-        type: string
       page:
         description: 椤电爜
         type: integer
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
+      search_map:
+        additionalProperties: true
+        description: '鎼滅储鏉′欢: map[string]interface{} {"member_name": "閿�鍞礋璐ｄ汉", "number":
+          "鍚堝悓缂栧彿", "created_at": "鍒涘缓鏃堕棿"}'
+        type: object
     type: object
   request.GetFaqList:
     properties:
@@ -3026,14 +3344,18 @@
     type: object
   request.GetMasterOrderList:
     properties:
-      keyword:
-        type: string
       page:
         description: 椤电爜
         type: integer
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
+      search_map:
+        additionalProperties: true
+        description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"number": "閿�鍞�诲崟鍙�",
+          "client_name": "瀹㈡埛鍚嶇О", "member_name": "閿�鍞礋璐ｄ汉", "start_time": "寮�濮嬫椂闂�", "end_time":
+          "缁撴潫鏃堕棿", "money": "鎬婚噾棰�", "member_name": "璐熻矗浜�"}'
+        type: object
     type: object
   request.GetOrderManageList:
     properties:
@@ -3059,25 +3381,34 @@
     type: object
   request.GetQuotationList:
     properties:
-      keyword:
-        type: string
       page:
         description: 椤电爜
         type: integer
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
+      searchMap:
+        additionalProperties: true
+        description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"sale_chance_id":
+          閿�鍞嚎绱d, "client_name": "瀹㈡埛鍚嶇О", "member_name": "閿�鍞礋璐ｄ汉", "contact_name": "鑱旂郴浜�",
+          "validity_date": "鏈夋晥鏈�"}'
+        type: object
     type: object
   request.GetSaleChanceList:
     properties:
-      keyword:
-        type: string
       page:
         description: 椤电爜
         type: integer
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
+      search_map:
+        additionalProperties: true
+        description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"name": "鏈轰細鍚嶇О",
+          "client_name": "瀹㈡埛鍚嶇О","number":"缂栧彿", "contact_name":"鑱旂郴浜哄鍚�", "member_name":
+          "閿�鍞礋璐ｄ汉", "status": "鐘舵��", "sale_stage": "闃舵", "possibilities": "鍙兘鎬�", "expected_time":
+          "棰勮鎴愪氦鏃堕棿", "budget": "璧勯噾缁濆鍊�", "projected_amount": "棰勮鍚堝悓閲戦"}'
+        type: object
     type: object
   request.GetSalesDetailsList:
     properties:
@@ -3111,6 +3442,8 @@
     properties:
       keyword:
         type: string
+      keywordType:
+        $ref: '#/definitions/constvar.SalesRefundKeywordType'
       page:
         description: 椤电爜
         type: integer
@@ -3171,17 +3504,43 @@
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
+      serviceOrderId:
+        description: 鏈嶅姟鍥炶鍗昳d
+        type: integer
     type: object
-  request.GetSubOrderList:
+  request.GetServiceOrderList:
     properties:
       keyword:
         type: string
+      keywordType:
+        $ref: '#/definitions/constvar.ServiceOrderKeywordType'
       page:
         description: 椤电爜
         type: integer
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
+      queryClass:
+        $ref: '#/definitions/constvar.ServiceOrderQueryClass'
+      salesDetailsId:
+        type: integer
+      serviceContractId:
+        type: integer
+    type: object
+  request.GetSubOrderList:
+    properties:
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+      search_map:
+        additionalProperties: true
+        description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"number": "閿�鍞瓙鍗曞彿",
+          "client_name": "瀹㈡埛鍚嶇О", "master_order_number": "閿�鍞�诲崟鍙�", "member_name": "閿�鍞礋璐ｄ汉",
+          "master_order_id": "閿�鍞�诲崟id"}'
+        type: object
     type: object
   request.GetUserList:
     properties:
@@ -3230,6 +3589,16 @@
         type: string
       subOrderId:
         type: integer
+    type: object
+  request.PushSaleChance:
+    properties:
+      id:
+        type: integer
+      step:
+        type: integer
+    required:
+    - id
+    - step
     type: object
   request.PushSalesLeads:
     properties:
@@ -3314,7 +3683,8 @@
     type: object
   request.SalesRefund:
     properties:
-      accountId:
+      bankAccountId:
+        description: 璐︽埛id
         type: integer
       clientId:
         type: integer
@@ -3324,6 +3694,9 @@
         type: integer
       number:
         type: string
+      paymentTypeId:
+        description: 鏀舵鏂瑰紡ID
+        type: integer
       products:
         items:
           $ref: '#/definitions/model.Product'
@@ -3332,8 +3705,13 @@
         type: string
       refundDate:
         type: string
-      refundMethod:
-        type: string
+      sourceId:
+        description: 婧愬崟id
+        type: integer
+      sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.RefundSourceType'
+        description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
     type: object
   request.SalesReturn:
     properties:
@@ -3344,17 +3722,28 @@
       number:
         type: string
       products:
+        description: 閫�璐т骇鍝�
         items:
           $ref: '#/definitions/model.Product'
         type: array
       reason:
+        description: 閫�璐у師鍥�
         type: string
       repository:
         type: string
       returnDate:
+        description: 閫�璐ф棩鏈�
         type: string
-      status:
+      salesReturnStatusId:
+        description: 閫�璐х姸鎬乮d
         type: integer
+      sourceId:
+        description: 婧愬崟id
+        type: integer
+      sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.SalesReturnSourceType'
+        description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級
     type: object
   request.SetAuthorityMenu:
     properties:
@@ -3589,6 +3978,17 @@
         type: array
     required:
     - client_types
+    type: object
+  request.UpdateCollectionProjection:
+    properties:
+      estimated_collection_amount:
+        description: 棰勮鏀舵閲戦
+        type: number
+      estimated_collection_time:
+        description: 棰勮鏀舵鏃堕棿
+        type: string
+      id:
+        type: integer
     type: object
   request.UpdateContact:
     properties:
@@ -4035,6 +4435,10 @@
         type: integer
       number:
         type: string
+      products:
+        items:
+          $ref: '#/definitions/model.Product'
+        type: array
       quotation_status_id:
         type: integer
       sale_chance_id:
@@ -4063,6 +4467,11 @@
     type: object
   request.UpdateReceipt:
     properties:
+      amount:
+        description: 鏀舵閲戦
+        type: number
+      bankAccount:
+        $ref: '#/definitions/model.BankAccount'
       bankAccountId:
         description: 璐︽埛id
         type: integer
@@ -4077,9 +4486,15 @@
       moneyType:
         description: 甯佺
         type: string
+      paymentType:
+        $ref: '#/definitions/model.PaymentType'
       paymentTypeId:
         description: 鏀舵鏂瑰紡ID
         type: integer
+      principal:
+        allOf:
+        - $ref: '#/definitions/model.User'
+        description: 璐熻矗浜篿d
       principalId:
         description: 璐熻矗浜篿d
         type: integer
@@ -4093,8 +4508,9 @@
         description: 婧愬崟id
         type: integer
       sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.ReceiptSourceType'
         description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
-        type: integer
     type: object
   request.UpdateRefundMethod:
     properties:
@@ -4435,6 +4851,15 @@
       amount:
         description: 閲戦
         type: number
+      amountReceivable:
+        description: 搴旀敹閲戦
+        type: number
+      amountReceived:
+        description: 宸叉敹閲戦
+        type: number
+      amountTotal:
+        description: 鎬婚
+        type: number
       collectionDate:
         description: 璁″垝鏀舵鏃ユ湡
         type: string
@@ -4462,12 +4887,13 @@
         description: 婧愬崟id
         type: integer
       sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.CollectionSourceType'
         description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁�2鏈嶅姟鍚堝悓3閿�鍞彂绁級
-        type: integer
       status:
         allOf:
         - $ref: '#/definitions/constvar.CollectionStatus'
-        description: 鐘舵�侊紙1鏈敹2宸叉敹锛�
+        description: 鐘舵�侊紙1鏈敹2閮ㄥ垎宸叉敹3宸叉敹锛�
       term:
         description: 鏈熸
         type: integer
@@ -4652,7 +5078,7 @@
         type: string
       satisfaction:
         type: integer
-      serviceId:
+      serviceOrderId:
         type: integer
       solveRate:
         type: integer
@@ -4679,9 +5105,6 @@
       contactId:
         description: 鑱旂郴浜篿d
         type: integer
-      contractId:
-        description: 鍚堝悓id
-        type: integer
       expectTime:
         description: 甯屾湜澶勭悊鏃堕棿
         type: string
@@ -4692,9 +5115,6 @@
         description: 鏁呴殰绫诲埆id
         type: integer
       id:
-        type: integer
-      orderId:
-        description: 閿�鍞鍗昳d
         type: integer
       priorityLevelId:
         description: 浼樺厛绾у埆id
@@ -4714,12 +5134,21 @@
       saleChanceId:
         description: 閿�鍞満浼歩d
         type: integer
+      salesDetailsId:
+        description: 閿�鍞鍗昳d
+        type: integer
+      serviceContractId:
+        description: 鍚堝悓id
+        type: integer
       serviceManId:
         description: 鏈嶅姟浜哄憳
         type: integer
       serviceNumber:
         description: 鏈嶅姟鍗曠紪鍙�
         type: string
+      serviceOrderStatusId:
+        description: 澶勭悊鐘舵��
+        type: integer
       serviceTypeId:
         description: 鏈嶅姟鏂瑰紡id
         type: integer
@@ -4732,15 +5161,19 @@
       solutionRemark:
         description: 鍐呴儴澶囨敞
         type: string
-      status:
-        description: 澶勭悊鐘舵��
-        type: integer
       subject:
         description: 涓婚
         type: string
       timeSpentId:
         description: 鑺辫垂鏃堕棿
         type: integer
+    type: object
+  request.UpdateServiceOrderStatus:
+    properties:
+      id:
+        type: integer
+      name:
+        type: string
     type: object
   request.UpdateServiceType:
     properties:
@@ -6220,6 +6653,64 @@
           schema:
             $ref: '#/definitions/contextx.Response'
       summary: 娣诲姞鏀舵棰勬祴
+      tags:
+      - CollectionProjection
+  /api/collectionProjection/delete/{id}:
+    delete:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: path
+        name: id
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 鍒犻櫎鏀舵棰勬祴
+      tags:
+      - CollectionProjection
+  /api/collectionProjection/list:
+    post:
+      parameters:
+      - description: 椤电爜
+        in: query
+        name: page
+        type: integer
+      - description: 姣忛〉澶у皬
+        in: query
+        name: pageSize
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 鑾峰彇鏀舵棰勬祴鍒楄〃
+      tags:
+      - CollectionProjection
+  /api/collectionProjection/update:
+    put:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.UpdateCollectionProjection'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 鏇存柊鏀舵棰勬祴
       tags:
       - CollectionProjection
   /api/contact/add:
@@ -9314,6 +9805,25 @@
       summary: 閿�鍞満浼氬垪琛�
       tags:
       - SaleChance
+  /api/saleChance/push:
+    put:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.PushSaleChance'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 鎺ㄨ繘閿�鍞満浼�
+      tags:
+      - SaleChance
   /api/saleChance/update:
     put:
       parameters:
@@ -10545,7 +11055,14 @@
       tags:
       - 鏈嶅姟鍗曠鐞�
   /api/serviceOrder/list:
-    get:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetServiceOrderList'
       produces:
       - application/json
       responses:
@@ -10582,6 +11099,107 @@
       summary: 鏇存柊鏈嶅姟鍗�
       tags:
       - 鏈嶅姟鍗曠鐞�
+  /api/serviceOrderStatus/add:
+    post:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.AddServiceOrderStatus'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 娣诲姞鏈嶅姟鍗曠姸鎬�
+      tags:
+      - 鏈嶅姟鍗曠姸鎬�
+  /api/serviceOrderStatus/delete/{id}:
+    delete:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: path
+        name: id
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 鍒犻櫎鏈嶅姟鍗曠姸鎬�
+      tags:
+      - 鏈嶅姟鍗曠姸鎬�
+  /api/serviceOrderStatus/list:
+    get:
+      parameters:
+      - in: query
+        name: keyword
+        type: string
+      - enum:
+        - ""
+        in: query
+        name: keywordType
+        type: string
+        x-enum-varnames:
+        - ServiceOrderStatusKeywordCustomerName
+      - description: 椤电爜
+        in: query
+        name: page
+        type: integer
+      - description: 姣忛〉澶у皬
+        in: query
+        name: pageSize
+        type: integer
+      - enum:
+        - ""
+        in: query
+        name: queryClass
+        type: string
+        x-enum-varnames:
+        - ServiceOrderStatusQueryClassExpireLessThen60Days
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.ListResponse'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/model.ServiceOrderStatus'
+                  type: array
+              type: object
+      summary: 鑾峰彇鏈嶅姟鍗曠姸鎬佸垪琛�
+      tags:
+      - 鏈嶅姟鍗曠姸鎬�
+  /api/serviceOrderStatus/update:
+    put:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.UpdateServiceOrderStatus'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/contextx.Response'
+      summary: 鏇存柊鏈嶅姟鍗曠姸鎬�
+      tags:
+      - 鏈嶅姟鍗曠姸鎬�
   /api/serviceType/add:
     post:
       parameters:

--
Gitblit v1.8.0