From 67c554b33cc0550929b6ec4855c52e7ca374ccee Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 13 八月 2023 14:41:30 +0800
Subject: [PATCH] 完善商品退货单
---
docs/swagger.yaml | 139 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 123 insertions(+), 16 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index bd69224..787e7f1 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,20 @@
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.SalesDetailsKeywordType:
enum:
- 瀹㈡埛鍚嶇О
@@ -128,6 +156,14 @@
- SalesDetailsKeywordTypeSignTime
- SalesDetailsKeywordTypePrincipal
- SalesDetailsKeywordTypeProductName
+ constvar.SalesReturnSourceType:
+ enum:
+ - 1
+ type: integer
+ x-enum-comments:
+ SalesReturnSourceTypeSaleDetails: 閿�鍞槑缁�
+ x-enum-varnames:
+ - SalesReturnSourceTypeSaleDetails
constvar.SalesStatus:
enum:
- 0
@@ -965,7 +1001,7 @@
properties:
amount:
description: 鏀舵閲戦
- type: string
+ type: number
bankAccountId:
description: 璐︽埛id
type: integer
@@ -996,8 +1032,9 @@
description: 婧愬崟id
type: integer
sourceType:
+ allOf:
+ - $ref: '#/definitions/constvar.ReceiptSourceType'
description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
- type: integer
type: object
model.RefundMethod:
properties:
@@ -1142,6 +1179,8 @@
type: object
model.SalesDetails:
properties:
+ Member:
+ $ref: '#/definitions/model.User'
address:
type: string
addressee:
@@ -1155,6 +1194,9 @@
amountReceived:
description: 宸叉敹閲戦
type: number
+ amountTotal:
+ description: 浠风◣鍚堣
+ type: number
amountUnInvoiced:
description: 鏈紑绁ㄩ噾棰�
type: number
@@ -1163,6 +1205,12 @@
clientId:
type: integer
conditions:
+ type: string
+ createTime:
+ type: string
+ creatorId:
+ type: integer
+ creatorName:
type: string
deliveryDate:
type: string
@@ -1271,8 +1319,20 @@
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:
@@ -1280,17 +1340,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:
@@ -1317,6 +1388,15 @@
properties:
amount:
description: 閲戦
+ type: number
+ amountReceivable:
+ description: 搴旀敹閲戦
+ type: number
+ amountReceived:
+ description: 宸叉敹閲戦
+ type: number
+ amountTotal:
+ description: 鎬婚
type: number
collectionDate:
description: 璁″垝鏀舵鏃ユ湡
@@ -1345,12 +1425,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
@@ -1367,6 +1448,9 @@
type: number
amountReceived:
description: 宸叉敹閲戦
+ type: number
+ amountTotal:
+ description: 浠风◣鍚堣
type: number
amountUnInvoiced:
description: 鏈紑绁ㄩ噾棰�
@@ -1585,6 +1669,9 @@
type: string
serviceOrderStatus:
$ref: '#/definitions/model.ServiceOrderStatus'
+ serviceOrderStatusId:
+ description: 澶勭悊鐘舵��
+ type: integer
serviceType:
$ref: '#/definitions/model.ServiceType'
serviceTypeId:
@@ -1598,9 +1685,6 @@
solutionRemark:
description: 鍐呴儴澶囨敞
type: string
- status:
- description: 澶勭悊鐘舵��
- type: integer
subject:
description: 涓婚
type: string
@@ -2198,7 +2282,7 @@
properties:
amount:
description: 鏀舵閲戦
- type: string
+ type: number
bankAccountId:
description: 璐︽埛id
type: integer
@@ -2229,8 +2313,9 @@
description: 婧愬崟id
type: integer
sourceType:
+ allOf:
+ - $ref: '#/definitions/constvar.ReceiptSourceType'
description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
- type: integer
type: object
request.AddRefundMethod:
properties:
@@ -3427,17 +3512,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:
@@ -4148,7 +4244,7 @@
properties:
amount:
description: 鏀舵閲戦
- type: string
+ type: number
bankAccountId:
description: 璐︽埛id
type: integer
@@ -4179,8 +4275,9 @@
description: 婧愬崟id
type: integer
sourceType:
+ allOf:
+ - $ref: '#/definitions/constvar.ReceiptSourceType'
description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
- type: integer
type: object
request.UpdateRefundMethod:
properties:
@@ -4521,6 +4618,15 @@
amount:
description: 閲戦
type: number
+ amountReceivable:
+ description: 搴旀敹閲戦
+ type: number
+ amountReceived:
+ description: 宸叉敹閲戦
+ type: number
+ amountTotal:
+ description: 鎬婚
+ type: number
collectionDate:
description: 璁″垝鏀舵鏃ユ湡
type: string
@@ -4548,12 +4654,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