From 08b079be72dc2358fd556ce0c1a57599bdd4c689 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 15 八月 2023 17:40:05 +0800
Subject: [PATCH] fix
---
docs/swagger.yaml | 393 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 360 insertions(+), 33 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 65383ab..9952676 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,56 @@
- SalesDetailsKeywordTypeSignTime
- SalesDetailsKeywordTypePrincipal
- SalesDetailsKeywordTypeProductName
+ constvar.SalesRefundKeywordType:
+ enum:
+ - 閿�鍞��璐у崟缂栧彿
+ - 瀹㈡埛鍚嶇О
+ - 閫�娆炬棩鏈�
+ - 璐︽埛
+ - 鏄惁寮�绁�
+ - 浠樻鏂瑰紡
+ - 閿�鍞礋璐d汉
+ - 淇敼鏃堕棿
+ - 浠风◣鍚堣
+ type: string
+ x-enum-varnames:
+ - SalesRefundKeywordRefundNumber
+ - SalesRefundKeywordClientName
+ - SalesRefundKeywordRefundDate
+ - SalesRefundKeywordAccount
+ - SalesRefundKeywordIsInvoice
+ - SalesRefundKeywordPaymentType
+ - SalesRefundKeywordPrincipal
+ - SalesRefundKeywordUpdateAt
+ - SalesRefundKeywordPriceTotal
+ constvar.SalesReturnKeywordType:
+ enum:
+ - 閿�鍞��璐у崟缂栧彿
+ - 瀹㈡埛鍚嶇О
+ - 閫�娆炬棩鏈�
+ - 鐘舵��
+ - 閫�鍏ヤ粨搴�
+ - 搴旈��娆�
+ - 宸查��娆�
+ - 閿�鍞礋璐d汉
+ type: string
+ x-enum-varnames:
+ - SalesReturnKeywordReturnNumber
+ - SalesReturnKeywordClientName
+ - SalesReturnKeywordReturnDate
+ - SalesReturnKeywordStatus
+ - SalesReturnKeywordRepository
+ - SalesReturnKeywordAmountShouldRefund
+ - SalesReturnKeywordAmountHasRefund
+ - SalesReturnKeywordPrincipal
+ constvar.SalesReturnSourceType:
+ enum:
+ - 1
+ type: integer
+ x-enum-comments:
+ SalesReturnSourceTypeSaleDetails: 閿�鍞槑缁�
+ x-enum-varnames:
+ - SalesReturnSourceTypeSaleDetails
constvar.SalesStatus:
enum:
- 0
@@ -466,6 +552,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 +564,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:
@@ -519,6 +605,8 @@
type: integer
is_first:
type: boolean
+ member:
+ $ref: '#/definitions/model.User'
member_id:
type: integer
name:
@@ -568,6 +656,8 @@
type: integer
is_first:
type: boolean
+ member:
+ $ref: '#/definitions/model.User'
member_id:
type: integer
name:
@@ -591,12 +681,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:
@@ -607,6 +714,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:
@@ -674,6 +786,8 @@
$ref: '#/definitions/model.Client'
client_id:
type: integer
+ client_status:
+ $ref: '#/definitions/model.ClientStatus'
client_status_id:
type: integer
contact:
@@ -700,8 +814,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:
@@ -806,6 +924,8 @@
type: string
id:
type: integer
+ member:
+ $ref: '#/definitions/model.User'
member_id:
type: integer
money:
@@ -957,6 +1077,8 @@
type: string
id:
type: integer
+ member:
+ $ref: '#/definitions/model.User'
member_id:
type: integer
number:
@@ -965,6 +1087,8 @@
items:
$ref: '#/definitions/model.Product'
type: array
+ quotation_status:
+ $ref: '#/definitions/model.QuotationStatus'
quotation_status_id:
type: integer
sale_chance:
@@ -983,6 +1107,11 @@
type: object
model.Receipt:
properties:
+ amount:
+ description: 鏀舵閲戦
+ type: number
+ bankAccount:
+ $ref: '#/definitions/model.BankAccount'
bankAccountId:
description: 璐︽埛id
type: integer
@@ -997,9 +1126,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 +1148,9 @@
description: 婧愬崟id
type: integer
sourceType:
+ allOf:
+ - $ref: '#/definitions/constvar.ReceiptSourceType'
description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
- type: integer
type: object
model.RefundMethod:
properties:
@@ -1102,6 +1238,8 @@
type: string
key_maker:
type: string
+ member:
+ $ref: '#/definitions/model.User'
member_id:
type: integer
name:
@@ -1114,6 +1252,8 @@
type: string
possibilities_id:
type: integer
+ possibility:
+ $ref: '#/definitions/model.Possibility'
process:
type: string
projected_amount:
@@ -1126,18 +1266,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:
@@ -1163,6 +1309,8 @@
type: object
model.SalesDetails:
properties:
+ Member:
+ $ref: '#/definitions/model.User'
address:
type: string
addressee:
@@ -1176,6 +1324,9 @@
amountReceived:
description: 宸叉敹閲戦
type: number
+ amountTotal:
+ description: 浠风◣鍚堣
+ type: number
amountUnInvoiced:
description: 鏈紑绁ㄩ噾棰�
type: number
@@ -1184,6 +1335,12 @@
clientId:
type: integer
conditions:
+ type: string
+ createTime:
+ type: string
+ creatorId:
+ type: integer
+ creatorName:
type: string
deliveryDate:
type: string
@@ -1244,6 +1401,8 @@
type: array
id:
type: integer
+ member:
+ $ref: '#/definitions/model.User'
member_id:
type: integer
name:
@@ -1260,6 +1419,8 @@
$ref: '#/definitions/model.Region'
region_id:
type: integer
+ sales_sources:
+ $ref: '#/definitions/model.SalesSources'
sales_sources_id:
type: integer
sales_status:
@@ -1267,18 +1428,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
+ type: string
+ 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 +1467,36 @@
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: 閫�璐х姸鎬�
+ amountHasRefund:
+ description: 宸查��娆鹃噾棰�
+ type: number
+ amountShouldRefund:
+ description: 搴旈��娆鹃噾棰�
+ type: number
+ client:
+ $ref: '#/definitions/model.Client'
clientId:
type: integer
+ createTime:
+ type: string
+ creatorName:
+ type: string
id:
type: integer
memberId:
@@ -1301,17 +1504,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 +1552,15 @@
properties:
amount:
description: 閲戦
+ type: number
+ amountReceivable:
+ description: 搴旀敹閲戦
+ type: number
+ amountReceived:
+ description: 宸叉敹閲戦
+ type: number
+ amountTotal:
+ description: 鎬婚
type: number
collectionDate:
description: 璁″垝鏀舵鏃ユ湡
@@ -1366,12 +1589,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
@@ -1389,6 +1613,9 @@
amountReceived:
description: 宸叉敹閲戦
type: number
+ amountTotal:
+ description: 浠风◣鍚堣
+ type: number
amountUnInvoiced:
description: 鏈紑绁ㄩ噾棰�
type: number
@@ -1404,6 +1631,8 @@
type: string
id:
type: integer
+ member:
+ $ref: '#/definitions/model.User'
memberId:
type: integer
number:
@@ -1672,8 +1901,12 @@
type: integer
id:
type: integer
+ masterOrder:
+ $ref: '#/definitions/model.MasterOrder'
masterOrderId:
type: integer
+ member:
+ $ref: '#/definitions/model.User'
memberId:
type: integer
number:
@@ -2231,6 +2464,11 @@
type: object
request.AddReceipt:
properties:
+ amount:
+ description: 鏀舵閲戦
+ type: number
+ bankAccount:
+ $ref: '#/definitions/model.BankAccount'
bankAccountId:
description: 璐︽埛id
type: integer
@@ -2245,9 +2483,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 +2505,9 @@
description: 婧愬崟id
type: integer
sourceType:
+ allOf:
+ - $ref: '#/definitions/constvar.ReceiptSourceType'
description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級
- type: integer
type: object
request.AddRefundMethod:
properties:
@@ -2884,6 +3129,11 @@
description: 鐢ㄦ埛宀椾綅
type: string
type: object
+ request.CheckClientName:
+ properties:
+ name:
+ type: string
+ type: object
request.Contact:
properties:
birthday:
@@ -3084,14 +3334,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": "閿�鍞礋璐d汉", "number":
+ "鍚堝悓缂栧彿", "created_at": "鍒涘缓鏃堕棿"}'
+ type: object
type: object
request.GetFaqList:
properties:
@@ -3126,14 +3379,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": "閿�鍞礋璐d汉", "start_time": "寮�濮嬫椂闂�", "end_time":
+ "缁撴潫鏃堕棿", "money": "鎬婚噾棰�", "member_name": "璐熻矗浜�"}'
+ type: object
type: object
request.GetOrderManageList:
properties:
@@ -3165,10 +3422,11 @@
pageSize:
description: 姣忛〉澶у皬
type: integer
- searchMap:
+ search_map:
additionalProperties: true
description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"sale_chance_id":
- 閿�鍞嚎绱d}'
+ 閿�鍞嚎绱d, "client_name": "瀹㈡埛鍚嶇О", "member_name": "閿�鍞礋璐d汉", "contact_name": "鑱旂郴浜�",
+ "validity_date": "鏈夋晥鏈�"}'
type: object
type: object
request.GetSaleChanceList:
@@ -3219,6 +3477,8 @@
properties:
keyword:
type: string
+ keywordType:
+ $ref: '#/definitions/constvar.SalesRefundKeywordType'
page:
description: 椤电爜
type: integer
@@ -3230,6 +3490,8 @@
properties:
keyword:
type: string
+ keywordType:
+ $ref: '#/definitions/constvar.SalesReturnKeywordType'
page:
description: 椤电爜
type: integer
@@ -3304,14 +3566,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": "閿�鍞礋璐d汉",
+ "master_order_id": "閿�鍞�诲崟id"}'
+ type: object
type: object
request.GetUserList:
properties:
@@ -3454,16 +3720,20 @@
type: object
request.SalesRefund:
properties:
- accountId:
+ bankAccountId:
+ description: 璐︽埛id
type: integer
clientId:
type: integer
isInvoice:
- type: integer
+ type: string
memberId:
type: integer
number:
type: string
+ paymentTypeId:
+ description: 鏀舵鏂瑰紡ID
+ type: integer
products:
items:
$ref: '#/definitions/model.Product'
@@ -3472,8 +3742,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 +3759,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 +4504,11 @@
type: object
request.UpdateReceipt:
properties:
+ amount:
+ description: 鏀舵閲戦
+ type: number
+ bankAccount:
+ $ref: '#/definitions/model.BankAccount'
bankAccountId:
description: 璐︽埛id
type: integer
@@ -4232,9 +4523,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 +4545,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 +4888,15 @@
amount:
description: 閲戦
type: number
+ amountReceivable:
+ description: 搴旀敹閲戦
+ type: number
+ amountReceived:
+ description: 宸叉敹閲戦
+ type: number
+ amountTotal:
+ description: 鎬婚
+ type: number
collectionDate:
description: 璁″垝鏀舵鏃ユ湡
type: string
@@ -4617,12 +4924,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
@@ -6011,6 +6319,25 @@
summary: 娣诲姞瀹㈡埛
tags:
- Client
+ /api/client/checkName:
+ post:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.CheckClientName'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ summary: 妫�鏌ュ鎴峰悕绉版槸鍚﹂噸澶�
+ tags:
+ - Client
/api/client/delete:
delete:
parameters:
--
Gitblit v1.8.0