From f84d9c46574a2cd663105859035bc17891270923 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 10:41:54 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 docs/swagger.yaml |  315 ++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 254 insertions(+), 61 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index ce56d7b..3bb3424 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
@@ -633,23 +699,6 @@
       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:
       id:
@@ -1000,6 +1049,11 @@
     type: object
   model.Receipt:
     properties:
+      amount:
+        description: 鏀舵閲戦
+        type: number
+      bankAccount:
+        $ref: '#/definitions/model.BankAccount'
       bankAccountId:
         description: 璐︽埛id
         type: integer
@@ -1014,9 +1068,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
@@ -1030,8 +1090,9 @@
         description: 婧愬崟id
         type: integer
       sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.ReceiptSourceType'
         description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
-        type: integer
     type: object
   model.RefundMethod:
     properties:
@@ -1180,6 +1241,8 @@
     type: object
   model.SalesDetails:
     properties:
+      Member:
+        $ref: '#/definitions/model.User'
       address:
         type: string
       addressee:
@@ -1193,6 +1256,9 @@
       amountReceived:
         description: 宸叉敹閲戦
         type: number
+      amountTotal:
+        description: 浠风◣鍚堣
+        type: number
       amountUnInvoiced:
         description: 鏈紑绁ㄩ噾棰�
         type: number
@@ -1201,6 +1267,12 @@
       clientId:
         type: integer
       conditions:
+        type: string
+      createTime:
+        type: string
+      creatorId:
+        type: integer
+      creatorName:
         type: string
       deliveryDate:
         type: string
@@ -1284,18 +1356,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'
@@ -1304,13 +1395,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:
@@ -1318,17 +1426,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:
@@ -1355,6 +1474,15 @@
     properties:
       amount:
         description: 閲戦
+        type: number
+      amountReceivable:
+        description: 搴旀敹閲戦
+        type: number
+      amountReceived:
+        description: 宸叉敹閲戦
+        type: number
+      amountTotal:
+        description: 鎬婚
         type: number
       collectionDate:
         description: 璁″垝鏀舵鏃ユ湡
@@ -1383,12 +1511,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
@@ -1405,6 +1534,9 @@
         type: number
       amountReceived:
         description: 宸叉敹閲戦
+        type: number
+      amountTotal:
+        description: 浠风◣鍚堣
         type: number
       amountUnInvoiced:
         description: 鏈紑绁ㄩ噾棰�
@@ -1501,8 +1633,6 @@
         $ref: '#/definitions/model.Contact'
       contactId:
         type: integer
-      customerServiceSheet:
-        $ref: '#/definitions/model.CustomerServiceSheet'
       file:
         type: string
       id:
@@ -1527,10 +1657,10 @@
         $ref: '#/definitions/model.Satisfaction'
       satisfactionId:
         type: integer
-      serviceId:
-        type: integer
       serviceOrder:
         $ref: '#/definitions/model.ServiceOrder'
+      serviceOrderId:
+        type: integer
       solveRate:
         $ref: '#/definitions/model.SolveRate'
       solveRateId:
@@ -1566,11 +1696,6 @@
       contactId:
         description: 鑱旂郴浜篿d
         type: integer
-      contract:
-        $ref: '#/definitions/model.Contract'
-      contractId:
-        description: 鍚堝悓id
-        type: integer
       expectTime:
         description: 甯屾湜澶勭悊鏃堕棿
         type: string
@@ -1586,11 +1711,6 @@
         type: integer
       id:
         type: integer
-      orderId:
-        description: 閿�鍞鍗昳d
-        type: integer
-      orderManage:
-        $ref: '#/definitions/model.OrderManage'
       priorityLevel:
         $ref: '#/definitions/model.PriorityLevel'
       priorityLevelId:
@@ -1614,6 +1734,16 @@
         $ref: '#/definitions/model.SaleChance'
       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: 鏈嶅姟浜哄憳
@@ -2250,6 +2380,11 @@
     type: object
   request.AddReceipt:
     properties:
+      amount:
+        description: 鏀舵閲戦
+        type: number
+      bankAccount:
+        $ref: '#/definitions/model.BankAccount'
       bankAccountId:
         description: 璐︽埛id
         type: integer
@@ -2264,9 +2399,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
@@ -2280,8 +2421,9 @@
         description: 婧愬崟id
         type: integer
       sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.ReceiptSourceType'
         description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
-        type: integer
     type: object
   request.AddRefundMethod:
     properties:
@@ -2673,7 +2815,7 @@
         type: string
       satisfaction:
         type: integer
-      serviceId:
+      serviceOrderId:
         type: integer
       solveRate:
         type: integer
@@ -2700,9 +2842,6 @@
       contactId:
         description: 鑱旂郴浜篿d
         type: integer
-      contractId:
-        description: 鍚堝悓id
-        type: integer
       expectTime:
         description: 甯屾湜澶勭悊鏃堕棿
         type: string
@@ -2711,9 +2850,6 @@
         type: integer
       faultTypeId:
         description: 鏁呴殰绫诲埆id
-        type: integer
-      orderId:
-        description: 閿�鍞鍗昳d
         type: integer
       priorityLevelId:
         description: 浼樺厛绾у埆id
@@ -2732,6 +2868,12 @@
         type: string
       saleChanceId:
         description: 閿�鍞満浼歩d
+        type: integer
+      salesDetailsId:
+        description: 閿�鍞鍗昳d
+        type: integer
+      serviceContractId:
+        description: 鍚堝悓id
         type: integer
       serviceManId:
         description: 鏈嶅姟浜哄憳
@@ -3243,6 +3385,8 @@
     properties:
       keyword:
         type: string
+      keywordType:
+        $ref: '#/definitions/constvar.SalesRefundKeywordType'
       page:
         description: 椤电爜
         type: integer
@@ -3303,6 +3447,9 @@
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
+      serviceOrderId:
+        description: 鏈嶅姟鍥炶鍗昳d
+        type: integer
     type: object
   request.GetServiceOrderList:
     properties:
@@ -3318,6 +3465,10 @@
         type: integer
       queryClass:
         $ref: '#/definitions/constvar.ServiceOrderQueryClass'
+      salesDetailsId:
+        type: integer
+      serviceContractId:
+        type: integer
     type: object
   request.GetSubOrderList:
     properties:
@@ -3471,7 +3622,8 @@
     type: object
   request.SalesRefund:
     properties:
-      accountId:
+      bankAccountId:
+        description: 璐︽埛id
         type: integer
       clientId:
         type: integer
@@ -3481,6 +3633,9 @@
         type: integer
       number:
         type: string
+      paymentTypeId:
+        description: 鏀舵鏂瑰紡ID
+        type: integer
       products:
         items:
           $ref: '#/definitions/model.Product'
@@ -3489,8 +3644,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:
@@ -3501,17 +3661,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:
@@ -4235,6 +4406,11 @@
     type: object
   request.UpdateReceipt:
     properties:
+      amount:
+        description: 鏀舵閲戦
+        type: number
+      bankAccount:
+        $ref: '#/definitions/model.BankAccount'
       bankAccountId:
         description: 璐︽埛id
         type: integer
@@ -4249,9 +4425,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
@@ -4265,8 +4447,9 @@
         description: 婧愬崟id
         type: integer
       sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.ReceiptSourceType'
         description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
-        type: integer
     type: object
   request.UpdateRefundMethod:
     properties:
@@ -4607,6 +4790,15 @@
       amount:
         description: 閲戦
         type: number
+      amountReceivable:
+        description: 搴旀敹閲戦
+        type: number
+      amountReceived:
+        description: 宸叉敹閲戦
+        type: number
+      amountTotal:
+        description: 鎬婚
+        type: number
       collectionDate:
         description: 璁″垝鏀舵鏃ユ湡
         type: string
@@ -4634,12 +4826,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
@@ -4824,7 +5017,7 @@
         type: string
       satisfaction:
         type: integer
-      serviceId:
+      serviceOrderId:
         type: integer
       solveRate:
         type: integer
@@ -4851,9 +5044,6 @@
       contactId:
         description: 鑱旂郴浜篿d
         type: integer
-      contractId:
-        description: 鍚堝悓id
-        type: integer
       expectTime:
         description: 甯屾湜澶勭悊鏃堕棿
         type: string
@@ -4864,9 +5054,6 @@
         description: 鏁呴殰绫诲埆id
         type: integer
       id:
-        type: integer
-      orderId:
-        description: 閿�鍞鍗昳d
         type: integer
       priorityLevelId:
         description: 浼樺厛绾у埆id
@@ -4886,6 +5073,12 @@
       saleChanceId:
         description: 閿�鍞満浼歩d
         type: integer
+      salesDetailsId:
+        description: 閿�鍞鍗昳d
+        type: integer
+      serviceContractId:
+        description: 鍚堝悓id
+        type: integer
       serviceManId:
         description: 鏈嶅姟浜哄憳
         type: integer

--
Gitblit v1.8.0