From 5053e0347804728c63c5498e0aa18129822454cb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 30 八月 2023 13:31:46 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm
---
docs/swagger.yaml | 157 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 126 insertions(+), 31 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index eae5e70..4d0f444 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -116,18 +116,6 @@
type: string
x-enum-varnames:
- PaymentTypeQueryClassExpireLessThen60Days
- constvar.ReceiptKeywordType:
- enum:
- - ""
- type: string
- x-enum-varnames:
- - ReceiptKeywordCustomerName
- constvar.ReceiptQueryClass:
- enum:
- - ""
- type: string
- x-enum-varnames:
- - ReceiptQueryClassExpireLessThen60Days
constvar.ReceiptSourceType:
enum:
- 1
@@ -136,6 +124,12 @@
- 4
- 5
type: integer
+ x-enum-comments:
+ ReceiptSourceTypeChuKuDan: 鍑哄簱鍗昳t
+ ReceiptSourceTypeCollectionPlan: 鏀舵璁″垝
+ ReceiptSourceTypeInvoice: 閿�鍞彂绁�
+ ReceiptSourceTypeSalesDetails: 閿�鍞槑缁嗗崟
+ ReceiptSourceTypeServiceContract: 鏈嶅姟鍚堝悓
x-enum-varnames:
- ReceiptSourceTypeSalesDetails
- ReceiptSourceTypeServiceContract
@@ -1158,6 +1152,10 @@
bankAccountId:
description: 璐︽埛id
type: integer
+ client:
+ allOf:
+ - $ref: '#/definitions/model.Client'
+ description: 瀹㈡埛id
clientId:
description: 瀹㈡埛id
type: integer
@@ -1415,6 +1413,8 @@
type: integer
signTime:
type: string
+ updateTime:
+ type: string
wechatOrderStatus:
$ref: '#/definitions/model.WechatOrderStatus'
wechatOrderStatusId:
@@ -1437,6 +1437,8 @@
country_id:
type: integer
desc:
+ type: string
+ detail_address:
type: string
followRecord:
items:
@@ -1471,6 +1473,8 @@
type: object
model.SalesRefund:
properties:
+ Source:
+ $ref: '#/definitions/model.SalesReturn'
amountTotal:
description: 浠风◣鍚堣
type: number
@@ -1517,6 +1521,8 @@
allOf:
- $ref: '#/definitions/constvar.RefundSourceType'
description: 鏉ユ簮绫诲瀷锛�1閿�鍞��璐э級
+ updateTime:
+ type: string
type: object
model.SalesReturn:
properties:
@@ -1569,6 +1575,8 @@
allOf:
- $ref: '#/definitions/constvar.SalesReturnSourceType'
description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級
+ updateTime:
+ type: string
type: object
model.SalesReturnStatus:
properties:
@@ -1622,6 +1630,10 @@
percent:
description: 姣斾緥
type: number
+ principal:
+ allOf:
+ - $ref: '#/definitions/model.User'
+ description: 鏀舵璐熻矗浜篒D
principalId:
description: 鏀舵璐熻矗浜篒D
type: integer
@@ -1670,6 +1682,10 @@
$ref: '#/definitions/model.Contact'
contactId:
type: integer
+ createTime:
+ type: string
+ creatorName:
+ type: string
endTime:
type: string
id:
@@ -1711,6 +1727,8 @@
startTime:
type: string
terms:
+ type: string
+ updateTime:
type: string
type: object
model.ServiceContractStatus:
@@ -1756,6 +1774,10 @@
$ref: '#/definitions/model.Contact'
contactId:
type: integer
+ createTime:
+ type: string
+ creatorName:
+ type: string
file:
type: string
id:
@@ -1792,6 +1814,8 @@
$ref: '#/definitions/model.TimelyRate'
timelyRateId:
type: integer
+ updateTime:
+ type: string
type: object
model.ServiceOrder:
properties:
@@ -1819,6 +1843,10 @@
contactId:
description: 鑱旂郴浜篿d
type: integer
+ createTime:
+ type: string
+ creatorName:
+ type: string
expectTime:
description: 甯屾湜澶勭悊鏃堕棿
type: string
@@ -1905,6 +1933,8 @@
timeSpentId:
description: 鑺辫垂鏃堕棿
type: integer
+ updateTime:
+ type: string
type: object
model.ServiceOrderStatus:
properties:
@@ -2031,10 +2061,16 @@
MaterialMode:
description: 鐗╂枡绫诲瀷
type: string
+ MaxInventory:
+ description: 鏈�澶у簱瀛�
+ type: integer
MinInventory:
description: 瀹夊叏搴撳瓨
type: integer
Name:
+ type: string
+ Node:
+ description: 澶囨敞
type: string
Number:
type: string
@@ -2044,6 +2080,12 @@
SalePrice:
description: 閿�鍞环鏍�
type: number
+ Specs:
+ description: 瑙勬牸
+ type: string
+ Type:
+ description: 鍨嬪彿
+ type: string
Unit:
type: string
type: object
@@ -2523,6 +2565,10 @@
bankAccountId:
description: 璐︽埛id
type: integer
+ client:
+ allOf:
+ - $ref: '#/definitions/model.Client'
+ description: 瀹㈡埛id
clientId:
description: 瀹㈡埛id
type: integer
@@ -2741,6 +2787,9 @@
desc:
description: 澶囨敞
type: string
+ detail_address:
+ description: 璇︾粏鍦板潃
+ type: string
member_id:
description: 閿�鍞礋璐ｄ汉ID
type: integer
@@ -2821,6 +2870,10 @@
saleChanceId:
type: integer
salesDetailsId:
+ type: integer
+ serviceContractStatusId:
+ type: integer
+ serviceContractTypeId:
type: integer
serviceTimes:
type: integer
@@ -3408,7 +3461,9 @@
additionalProperties: true
description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"name": "瀹㈡埛鍚嶇О",
"phone": "鎵嬫満鍙风爜", "detail_address":"璇︾粏鍦板潃", "next_visit_time":"涓嬪洖鍥炶鏃ユ湡", "member_name":
- "閿�鍞礋璐ｄ汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆"}'
+ "閿�鍞礋璐ｄ汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆","representative":
+ "娉曞畾浠ｈ〃浜�", "registration_time": "娉ㄥ唽鏃堕棿", "business_scope": "缁忚惀鑼冨洿", "remark":
+ "澶囨敞", "not_admin":"1:鎴戠殑瀹㈡埛; 2:admin瀹㈡埛"}'
type: object
type: object
request.GetContactList:
@@ -4613,6 +4668,10 @@
bankAccountId:
description: 璐︽埛id
type: integer
+ client:
+ allOf:
+ - $ref: '#/definitions/model.Client'
+ description: 瀹㈡埛id
clientId:
description: 瀹㈡埛id
type: integer
@@ -4896,6 +4955,9 @@
desc:
description: 澶囨敞
type: string
+ detail_address:
+ description: 璇︾粏鍦板潃
+ type: string
id:
type: integer
member_id:
@@ -5015,6 +5077,10 @@
percent:
description: 姣斾緥
type: number
+ principal:
+ allOf:
+ - $ref: '#/definitions/model.User'
+ description: 鏀舵璐熻矗浜篒D
principalId:
description: 鏀舵璐熻矗浜篒D
type: integer
@@ -5061,6 +5127,10 @@
saleChanceId:
type: integer
salesDetailsId:
+ type: integer
+ serviceContractStatusId:
+ type: integer
+ serviceContractTypeId:
type: integer
serviceTimes:
type: integer
@@ -9396,16 +9466,6 @@
/api/receipt/list:
get:
parameters:
- - in: query
- name: keyword
- type: string
- - enum:
- - ""
- in: query
- name: keywordType
- type: string
- x-enum-varnames:
- - ReceiptKeywordCustomerName
- description: 椤电爜
in: query
name: page
@@ -9414,13 +9474,30 @@
in: query
name: pageSize
type: integer
+ - in: query
+ name: sourceId
+ type: integer
- enum:
- - ""
+ - 1
+ - 2
+ - 3
+ - 4
+ - 5
in: query
- name: queryClass
- type: string
+ name: sourceType
+ type: integer
+ x-enum-comments:
+ ReceiptSourceTypeChuKuDan: 鍑哄簱鍗昳t
+ ReceiptSourceTypeCollectionPlan: 鏀舵璁″垝
+ ReceiptSourceTypeInvoice: 閿�鍞彂绁�
+ ReceiptSourceTypeSalesDetails: 閿�鍞槑缁嗗崟
+ ReceiptSourceTypeServiceContract: 鏈嶅姟鍚堝悓
x-enum-varnames:
- - ReceiptQueryClassExpireLessThen60Days
+ - ReceiptSourceTypeSalesDetails
+ - ReceiptSourceTypeServiceContract
+ - ReceiptSourceTypeInvoice
+ - ReceiptSourceTypeCollectionPlan
+ - ReceiptSourceTypeChuKuDan
produces:
- application/json
responses:
@@ -10176,7 +10253,12 @@
"200":
description: OK
schema:
- $ref: '#/definitions/contextx.Response'
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ $ref: '#/definitions/request.AddSalesDetails'
+ type: object
summary: 娣诲姞閿�鍞槑缁�
tags:
- SalesDetails
@@ -10817,10 +10899,23 @@
/api/serviceCollectionPlan/list:
get:
parameters:
- - description: 鏈嶅姟鍚堝悓id
- in: query
- name: serviceContractId
+ - in: query
+ name: sourceId
+ required: true
type: integer
+ - enum:
+ - 1
+ - 2
+ in: query
+ name: sourceType
+ required: true
+ type: integer
+ x-enum-comments:
+ CollectionSourceTypeSaleDetails: 閿�鍞槑缁�
+ CollectionSourceTypeServiceContract: 鏈嶅姟鍚堝悓
+ x-enum-varnames:
+ - CollectionSourceTypeSaleDetails
+ - CollectionSourceTypeServiceContract
produces:
- application/json
responses:
--
Gitblit v1.8.0