From 037900f7998925e0c8727338aef3a1b199daa898 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 24 八月 2023 11:23:24 +0800
Subject: [PATCH] Merge branch 'hotfix'
---
docs/swagger.yaml | 128 +++++++++++++++++++++++++++++++-----------
1 files changed, 95 insertions(+), 33 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 3ae14c2..a2e23cf 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -270,6 +270,18 @@
- ServiceContractQueryClassExpireAfter60Day
- ServiceContractQueryClassExpiredBefore15Day
- ServiceContractQueryClassExpiredBefore60Day
+ constvar.ServiceContractStatusKeywordType:
+ enum:
+ - ""
+ type: string
+ x-enum-varnames:
+ - ServiceContractStatusKeywordCustomerName
+ constvar.ServiceContractStatusQueryClass:
+ enum:
+ - ""
+ type: string
+ x-enum-varnames:
+ - ServiceContractStatusQueryClassExpireLessThen60Days
constvar.ServiceFeeKeywordType:
enum:
- 瀹㈡埛鍚嶇О
@@ -739,6 +751,8 @@
$ref: '#/definitions/model.Quotation'
quotationId:
type: integer
+ serviceContractStatus:
+ $ref: '#/definitions/model.ServiceContractStatus'
statusId:
type: integer
updated_at:
@@ -821,6 +835,8 @@
$ref: '#/definitions/model.Contact'
contact_id:
type: integer
+ contact_information:
+ $ref: '#/definitions/model.ContactInformation'
contact_information_id:
type: integer
content:
@@ -1142,6 +1158,10 @@
bankAccountId:
description: 璐︽埛id
type: integer
+ client:
+ allOf:
+ - $ref: '#/definitions/model.Client'
+ description: 瀹㈡埛id
clientId:
description: 瀹㈡埛id
type: integer
@@ -1399,6 +1419,8 @@
type: integer
signTime:
type: string
+ updateTime:
+ type: string
wechatOrderStatus:
$ref: '#/definitions/model.WechatOrderStatus'
wechatOrderStatusId:
@@ -1501,6 +1523,8 @@
allOf:
- $ref: '#/definitions/constvar.RefundSourceType'
description: 鏉ユ簮绫诲瀷锛�1閿�鍞��璐э級
+ updateTime:
+ type: string
type: object
model.SalesReturn:
properties:
@@ -1553,6 +1577,8 @@
allOf:
- $ref: '#/definitions/constvar.SalesReturnSourceType'
description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級
+ updateTime:
+ type: string
type: object
model.SalesReturnStatus:
properties:
@@ -1654,6 +1680,10 @@
$ref: '#/definitions/model.Contact'
contactId:
type: integer
+ createTime:
+ type: string
+ creatorName:
+ type: string
endTime:
type: string
id:
@@ -1695,6 +1725,8 @@
startTime:
type: string
terms:
+ type: string
+ updateTime:
type: string
type: object
model.ServiceContractStatus:
@@ -1740,6 +1772,10 @@
$ref: '#/definitions/model.Contact'
contactId:
type: integer
+ createTime:
+ type: string
+ creatorName:
+ type: string
file:
type: string
id:
@@ -1776,6 +1812,8 @@
$ref: '#/definitions/model.TimelyRate'
timelyRateId:
type: integer
+ updateTime:
+ type: string
type: object
model.ServiceOrder:
properties:
@@ -1803,6 +1841,10 @@
contactId:
description: 鑱旂郴浜篿d
type: integer
+ createTime:
+ type: string
+ creatorName:
+ type: string
expectTime:
description: 甯屾湜澶勭悊鏃堕棿
type: string
@@ -1889,6 +1931,8 @@
timeSpentId:
description: 鑺辫垂鏃堕棿
type: integer
+ updateTime:
+ type: string
type: object
model.ServiceOrderStatus:
properties:
@@ -2507,6 +2551,10 @@
bankAccountId:
description: 璐︽埛id
type: integer
+ client:
+ allOf:
+ - $ref: '#/definitions/model.Client'
+ description: 瀹㈡埛id
clientId:
description: 瀹㈡埛id
type: integer
@@ -2823,10 +2871,10 @@
type: object
request.AddServiceContractStatus:
properties:
+ id:
+ type: integer
name:
type: string
- required:
- - name
type: object
request.AddServiceContractType:
properties:
@@ -3407,7 +3455,8 @@
additionalProperties: true
description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"name": "瀹㈡埛鍚嶇О",
"phone": "鎵嬫満鍙风爜", "detail_address":"璇︾粏鍦板潃", "next_visit_time":"涓嬪洖鍥炶鏃ユ湡", "member_name":
- "閿�鍞礋璐ｄ汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆", "is_first": "鏄惁鏄瑕佽仈绯讳汉"}'
+ "閿�鍞礋璐ｄ汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆", "is_first": "鏄惁鏄瑕佽仈绯讳汉",
+ "client_id": "clientId 鐢ㄤ簬杩斿洖棣栬鑱旂郴浜�"}'
type: object
type: object
request.GetContractList:
@@ -4596,6 +4645,10 @@
bankAccountId:
description: 璐︽埛id
type: integer
+ client:
+ allOf:
+ - $ref: '#/definitions/model.Client'
+ description: 瀹㈡埛id
clientId:
description: 瀹㈡埛id
type: integer
@@ -5066,18 +5119,6 @@
type: integer
name:
type: string
- required:
- - id
- - name
- type: object
- request.UpdateServiceContractStatuss:
- properties:
- service_contract_status:
- items:
- $ref: '#/definitions/request.UpdateServiceContractStatus'
- type: array
- required:
- - service_contract_status
type: object
request.UpdateServiceContractType:
properties:
@@ -5946,13 +5987,6 @@
list:
items:
$ref: '#/definitions/model.Satisfaction'
- type: array
- type: object
- response.ServiceContractStatusResponse:
- properties:
- list:
- items:
- $ref: '#/definitions/model.ServiceContractStatus'
type: array
type: object
response.ServiceContractTypeResponse:
@@ -10956,9 +10990,9 @@
description: OK
schema:
$ref: '#/definitions/contextx.Response'
- summary: 娣诲姞鏈嶅姟鍚堝悓鐘舵��
+ summary: 娣诲姞鍚堝悓鐘舵��
tags:
- - ServiceContractStatus
+ - 鍚堝悓鐘舵��
/api/serviceContractStatus/delete/{id}:
delete:
parameters:
@@ -10974,11 +11008,37 @@
description: OK
schema:
$ref: '#/definitions/contextx.Response'
- summary: 鍒犻櫎鏈嶅姟鍚堝悓鐘舵��
+ summary: 鍒犻櫎鍚堝悓鐘舵��
tags:
- - ServiceContractStatus
+ - 鍚堝悓鐘舵��
/api/serviceContractStatus/list:
get:
+ parameters:
+ - in: query
+ name: keyword
+ type: string
+ - enum:
+ - ""
+ in: query
+ name: keywordType
+ type: string
+ x-enum-varnames:
+ - ServiceContractStatusKeywordCustomerName
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
+ - enum:
+ - ""
+ in: query
+ name: queryClass
+ type: string
+ x-enum-varnames:
+ - ServiceContractStatusQueryClassExpireLessThen60Days
produces:
- application/json
responses:
@@ -10986,14 +11046,16 @@
description: OK
schema:
allOf:
- - $ref: '#/definitions/contextx.Response'
+ - $ref: '#/definitions/response.ListResponse'
- properties:
data:
- $ref: '#/definitions/response.ServiceContractStatusResponse'
+ items:
+ $ref: '#/definitions/model.ServiceContractStatus'
+ type: array
type: object
- summary: 鑾峰彇鏈嶅姟鍚堝悓鐘舵�佸垪琛�
+ summary: 鑾峰彇鍚堝悓鐘舵�佸垪琛�
tags:
- - ServiceContractStatus
+ - 鍚堝悓鐘舵��
/api/serviceContractStatus/update:
put:
parameters:
@@ -11002,7 +11064,7 @@
name: object
required: true
schema:
- $ref: '#/definitions/request.UpdateServiceContractStatuss'
+ $ref: '#/definitions/request.UpdateServiceContractStatus'
produces:
- application/json
responses:
@@ -11010,9 +11072,9 @@
description: OK
schema:
$ref: '#/definitions/contextx.Response'
- summary: 鏇存柊鏈嶅姟鍚堝悓鐘舵��
+ summary: 鏇存柊鍚堝悓鐘舵��
tags:
- - ServiceContractStatus
+ - 鍚堝悓鐘舵��
/api/serviceContractType/add:
post:
parameters:
--
Gitblit v1.8.0