From e913ce7ca504a026ae418b5b73e3ff21001101a8 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 14 八月 2023 17:38:03 +0800
Subject: [PATCH] update

---
 docs/swagger.yaml |  291 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 263 insertions(+), 28 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 65383ab..6f50cd2 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
@@ -466,6 +532,11 @@
     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
@@ -473,11 +544,6 @@
         type: string
       creator:
         type: integer
-      deleted_at:
-        description: |-
-          The date when the item was deleted
-          example: 2023-08-10 15:48:25
-        type: string
       estimated_collection_amount:
         type: number
       estimated_collection_date:
@@ -591,11 +657,24 @@
     type: object
   model.Contract:
     properties:
+      _:
+        description: |-
+          The date when the item was deleted
+          example: 2023-08-10 15:48:25
+        type: string
       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
       memberId:
         type: integer
@@ -607,6 +686,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:
@@ -983,6 +1067,11 @@
     type: object
   model.Receipt:
     properties:
+      amount:
+        description: 鏀舵閲戦
+        type: number
+      bankAccount:
+        $ref: '#/definitions/model.BankAccount'
       bankAccountId:
         description: 璐︽埛id
         type: integer
@@ -997,9 +1086,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
@@ -1013,8 +1108,9 @@
         description: 婧愬崟id
         type: integer
       sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.ReceiptSourceType'
         description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
-        type: integer
     type: object
   model.RefundMethod:
     properties:
@@ -1163,6 +1259,8 @@
     type: object
   model.SalesDetails:
     properties:
+      Member:
+        $ref: '#/definitions/model.User'
       address:
         type: string
       addressee:
@@ -1176,6 +1274,9 @@
       amountReceived:
         description: 宸叉敹閲戦
         type: number
+      amountTotal:
+        description: 浠风◣鍚堣
+        type: number
       amountUnInvoiced:
         description: 鏈紑绁ㄩ噾棰�
         type: number
@@ -1184,6 +1285,12 @@
       clientId:
         type: integer
       conditions:
+        type: string
+      createTime:
+        type: string
+      creatorId:
+        type: integer
+      creatorName:
         type: string
       deliveryDate:
         type: string
@@ -1267,18 +1374,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'
@@ -1287,13 +1413,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:
@@ -1301,17 +1444,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:
@@ -1338,6 +1492,15 @@
     properties:
       amount:
         description: 閲戦
+        type: number
+      amountReceivable:
+        description: 搴旀敹閲戦
+        type: number
+      amountReceived:
+        description: 宸叉敹閲戦
+        type: number
+      amountTotal:
+        description: 鎬婚
         type: number
       collectionDate:
         description: 璁″垝鏀舵鏃ユ湡
@@ -1366,12 +1529,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
@@ -1388,6 +1552,9 @@
         type: number
       amountReceived:
         description: 宸叉敹閲戦
+        type: number
+      amountTotal:
+        description: 浠风◣鍚堣
         type: number
       amountUnInvoiced:
         description: 鏈紑绁ㄩ噾棰�
@@ -2231,6 +2398,11 @@
     type: object
   request.AddReceipt:
     properties:
+      amount:
+        description: 鏀舵閲戦
+        type: number
+      bankAccount:
+        $ref: '#/definitions/model.BankAccount'
       bankAccountId:
         description: 璐︽埛id
         type: integer
@@ -2245,9 +2417,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
@@ -2261,8 +2439,9 @@
         description: 婧愬崟id
         type: integer
       sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.ReceiptSourceType'
         description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
-        type: integer
     type: object
   request.AddRefundMethod:
     properties:
@@ -3084,14 +3263,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:
@@ -3126,14 +3308,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:
@@ -3168,7 +3354,8 @@
       searchMap:
         additionalProperties: true
         description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"sale_chance_id":
-          閿�鍞嚎绱d}'
+          閿�鍞嚎绱d, "client_name": "瀹㈡埛鍚嶇О", "member_name": "閿�鍞礋璐ｄ汉", "contact_name": "鑱旂郴浜�",
+          "validity_date": "鏈夋晥鏈�"}'
         type: object
     type: object
   request.GetSaleChanceList:
@@ -3219,6 +3406,8 @@
     properties:
       keyword:
         type: string
+      keywordType:
+        $ref: '#/definitions/constvar.SalesRefundKeywordType'
       page:
         description: 椤电爜
         type: integer
@@ -3304,14 +3493,18 @@
     type: object
   request.GetSubOrderList:
     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": "瀹㈡埛鍚嶇О", "master_order_number": "閿�鍞�诲崟鍙�", "member_name": "閿�鍞礋璐ｄ汉",
+          "master_order_id": "閿�鍞�诲崟id"}'
+        type: object
     type: object
   request.GetUserList:
     properties:
@@ -3454,7 +3647,8 @@
     type: object
   request.SalesRefund:
     properties:
-      accountId:
+      bankAccountId:
+        description: 璐︽埛id
         type: integer
       clientId:
         type: integer
@@ -3464,6 +3658,9 @@
         type: integer
       number:
         type: string
+      paymentTypeId:
+        description: 鏀舵鏂瑰紡ID
+        type: integer
       products:
         items:
           $ref: '#/definitions/model.Product'
@@ -3472,8 +3669,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:
@@ -3484,17 +3686,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:
@@ -4218,6 +4431,11 @@
     type: object
   request.UpdateReceipt:
     properties:
+      amount:
+        description: 鏀舵閲戦
+        type: number
+      bankAccount:
+        $ref: '#/definitions/model.BankAccount'
       bankAccountId:
         description: 璐︽埛id
         type: integer
@@ -4232,9 +4450,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
@@ -4248,8 +4472,9 @@
         description: 婧愬崟id
         type: integer
       sourceType:
+        allOf:
+        - $ref: '#/definitions/constvar.ReceiptSourceType'
         description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
-        type: integer
     type: object
   request.UpdateRefundMethod:
     properties:
@@ -4590,6 +4815,15 @@
       amount:
         description: 閲戦
         type: number
+      amountReceivable:
+        description: 搴旀敹閲戦
+        type: number
+      amountReceived:
+        description: 宸叉敹閲戦
+        type: number
+      amountTotal:
+        description: 鎬婚
+        type: number
       collectionDate:
         description: 璁″垝鏀舵鏃ユ湡
         type: string
@@ -4617,12 +4851,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

--
Gitblit v1.8.0