From b0c07ddee23e2d54d03636f08af19f0934857cf4 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 25 八月 2023 10:32:56 +0800
Subject: [PATCH] Merge branch 'hotfix'
---
docs/docs.go | 385 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 303 insertions(+), 82 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 2bd1b36..1d57580 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1586,7 +1586,7 @@
}
}
},
- "/api/contract/delete/{id}": {
+ "/api/contract/delete": {
"delete": {
"produces": [
"application/json"
@@ -1597,11 +1597,13 @@
"summary": "鍒犻櫎鍚堝悓",
"parameters": [
{
- "type": "integer",
"description": "鏌ヨ鍙傛暟",
- "name": "id",
- "in": "path",
- "required": true
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.DeleteContract"
+ }
}
],
"responses": {
@@ -4008,7 +4010,7 @@
}
}
},
- "/api/masterOrder/delete/{id}": {
+ "/api/masterOrder/delete": {
"delete": {
"produces": [
"application/json"
@@ -4019,11 +4021,13 @@
"summary": "鍒犻櫎涓昏鍗�",
"parameters": [
{
- "type": "integer",
"description": "鏌ヨ鍙傛暟",
- "name": "id",
- "in": "path",
- "required": true
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.DeleteMasterOrder"
+ }
}
],
"responses": {
@@ -5226,7 +5230,7 @@
}
}
},
- "/api/quotation/delete/{id}": {
+ "/api/quotation/delete": {
"delete": {
"produces": [
"application/json"
@@ -5237,11 +5241,13 @@
"summary": "鍒犻櫎鎶ヤ环鍗�",
"parameters": [
{
- "type": "integer",
"description": "鏌ヨ鍙傛暟",
- "name": "id",
- "in": "path",
- "required": true
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.DeleteQuotation"
+ }
}
],
"responses": {
@@ -6379,7 +6385,7 @@
}
}
},
- "/api/saleChance/delete/{id}": {
+ "/api/saleChance/delete": {
"delete": {
"produces": [
"application/json"
@@ -6390,11 +6396,13 @@
"summary": "鍒犻櫎閿�鍞満浼�",
"parameters": [
{
- "type": "integer",
"description": "鏌ヨ鍙傛暟",
- "name": "id",
- "in": "path",
- "required": true
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.DeleteSaleChance"
+ }
}
],
"responses": {
@@ -6771,7 +6779,19 @@
"200": {
"description": "OK",
"schema": {
- "$ref": "#/definitions/contextx.Response"
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/request.AddSalesDetails"
+ }
+ }
+ }
+ ]
}
}
}
@@ -8014,9 +8034,9 @@
"application/json"
],
"tags": [
- "ServiceContractStatus"
+ "鍚堝悓鐘舵��"
],
- "summary": "娣诲姞鏈嶅姟鍚堝悓鐘舵��",
+ "summary": "娣诲姞鍚堝悓鐘舵��",
"parameters": [
{
"description": "鏌ヨ鍙傛暟",
@@ -8044,9 +8064,9 @@
"application/json"
],
"tags": [
- "ServiceContractStatus"
+ "鍚堝悓鐘舵��"
],
- "summary": "鍒犻櫎鏈嶅姟鍚堝悓鐘舵��",
+ "summary": "鍒犻櫎鍚堝悓鐘舵��",
"parameters": [
{
"type": "integer",
@@ -8072,22 +8092,66 @@
"application/json"
],
"tags": [
- "ServiceContractStatus"
+ "鍚堝悓鐘舵��"
],
- "summary": "鑾峰彇鏈嶅姟鍚堝悓鐘舵�佸垪琛�",
+ "summary": "鑾峰彇鍚堝悓鐘舵�佸垪琛�",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "keyword",
+ "in": "query"
+ },
+ {
+ "enum": [
+ ""
+ ],
+ "type": "string",
+ "x-enum-varnames": [
+ "ServiceContractStatusKeywordCustomerName"
+ ],
+ "name": "keywordType",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "enum": [
+ ""
+ ],
+ "type": "string",
+ "x-enum-varnames": [
+ "ServiceContractStatusQueryClassExpireLessThen60Days"
+ ],
+ "name": "queryClass",
+ "in": "query"
+ }
+ ],
"responses": {
"200": {
"description": "OK",
"schema": {
"allOf": [
{
- "$ref": "#/definitions/contextx.Response"
+ "$ref": "#/definitions/response.ListResponse"
},
{
"type": "object",
"properties": {
"data": {
- "$ref": "#/definitions/response.ServiceContractStatusResponse"
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.ServiceContractStatus"
+ }
}
}
}
@@ -8103,9 +8167,9 @@
"application/json"
],
"tags": [
- "ServiceContractStatus"
+ "鍚堝悓鐘舵��"
],
- "summary": "鏇存柊鏈嶅姟鍚堝悓鐘舵��",
+ "summary": "鏇存柊鍚堝悓鐘舵��",
"parameters": [
{
"description": "鏌ヨ鍙傛暟",
@@ -8113,7 +8177,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.UpdateServiceContractStatuss"
+ "$ref": "#/definitions/request.UpdateServiceContractStatus"
}
}
],
@@ -9336,7 +9400,7 @@
}
}
},
- "/api/subOrder/delete/{id}": {
+ "/api/subOrder/delete": {
"delete": {
"produces": [
"application/json"
@@ -9347,11 +9411,13 @@
"summary": "鍒犻櫎瀛愯鍗�",
"parameters": [
{
- "type": "integer",
"description": "鏌ヨ鍙傛暟",
- "name": "id",
- "in": "path",
- "required": true
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.DeleteSubOrder"
+ }
}
],
"responses": {
@@ -10515,6 +10581,24 @@
"ServiceContractQueryClassExpiredBefore60Day"
]
},
+ "constvar.ServiceContractStatusKeywordType": {
+ "type": "string",
+ "enum": [
+ ""
+ ],
+ "x-enum-varnames": [
+ "ServiceContractStatusKeywordCustomerName"
+ ]
+ },
+ "constvar.ServiceContractStatusQueryClass": {
+ "type": "string",
+ "enum": [
+ ""
+ ],
+ "x-enum-varnames": [
+ "ServiceContractStatusQueryClassExpireLessThen60Days"
+ ]
+ },
"constvar.ServiceFeeKeywordType": {
"type": "string",
"enum": [
@@ -10741,6 +10825,10 @@
"model.Client": {
"type": "object",
"properties": {
+ "_": {
+ "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
+ "type": "string"
+ },
"business_scope": {
"type": "string"
},
@@ -10786,6 +10874,13 @@
"country_id": {
"type": "integer"
},
+ "created_at": {
+ "description": "The date when the item was created\nexample: 2023-08-10 15:48:25",
+ "type": "string"
+ },
+ "creator_id": {
+ "type": "integer"
+ },
"detail_address": {
"type": "string"
},
@@ -10808,6 +10903,7 @@
}
},
"id": {
+ "description": "The ID of the item\nexample: 1",
"type": "integer"
},
"industry": {
@@ -10863,6 +10959,10 @@
},
"service_member_id": {
"type": "integer"
+ },
+ "updated_at": {
+ "description": "The date when the item was last updated\nexample: 2023-08-10 15:48:25",
+ "type": "string"
}
}
},
@@ -11141,6 +11241,9 @@
"quotationId": {
"type": "integer"
},
+ "serviceContractStatus": {
+ "$ref": "#/definitions/model.ServiceContractStatus"
+ },
"statusId": {
"type": "integer"
},
@@ -11264,6 +11367,9 @@
},
"contact_id": {
"type": "integer"
+ },
+ "contact_information": {
+ "$ref": "#/definitions/model.ContactInformation"
},
"contact_information_id": {
"type": "integer"
@@ -11751,6 +11857,14 @@
"description": "璐︽埛id",
"type": "integer"
},
+ "client": {
+ "description": "瀹㈡埛id",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.Client"
+ }
+ ]
+ },
"clientId": {
"description": "瀹㈡埛id",
"type": "integer"
@@ -12139,6 +12253,9 @@
"signTime": {
"type": "string"
},
+ "updateTime": {
+ "type": "string"
+ },
"wechatOrderStatus": {
"$ref": "#/definitions/model.WechatOrderStatus"
},
@@ -12292,6 +12409,9 @@
"$ref": "#/definitions/constvar.RefundSourceType"
}
]
+ },
+ "updateTime": {
+ "type": "string"
}
}
},
@@ -12371,6 +12491,9 @@
"$ref": "#/definitions/constvar.SalesReturnSourceType"
}
]
+ },
+ "updateTime": {
+ "type": "string"
}
}
},
@@ -12521,6 +12644,12 @@
"contactId": {
"type": "integer"
},
+ "createTime": {
+ "type": "string"
+ },
+ "creatorName": {
+ "type": "string"
+ },
"endTime": {
"type": "string"
},
@@ -12582,6 +12711,9 @@
"type": "string"
},
"terms": {
+ "type": "string"
+ },
+ "updateTime": {
"type": "string"
}
}
@@ -12652,6 +12784,12 @@
"contactId": {
"type": "integer"
},
+ "createTime": {
+ "type": "string"
+ },
+ "creatorName": {
+ "type": "string"
+ },
"file": {
"type": "string"
},
@@ -12705,6 +12843,9 @@
},
"timelyRateId": {
"type": "integer"
+ },
+ "updateTime": {
+ "type": "string"
}
}
},
@@ -12741,6 +12882,12 @@
"description": "鑱旂郴浜篿d",
"type": "integer"
},
+ "createTime": {
+ "type": "string"
+ },
+ "creatorName": {
+ "type": "string"
+ },
"expectTime": {
"description": "甯屾湜澶勭悊鏃堕棿",
"type": "string"
@@ -12773,12 +12920,13 @@
"description": "闂鎻忚堪",
"type": "string"
},
- "product": {
- "$ref": "#/definitions/model.Product"
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
},
- "productId": {
- "description": "浜у搧id",
- "type": "integer"
+ "productTypeName": {
+ "description": "浜у搧鍒嗙被鍚嶇О",
+ "type": "string"
},
"realTime": {
"description": "瀹為檯澶勭悊鏃堕棿",
@@ -12808,6 +12956,14 @@
"serviceContractId": {
"description": "鏈嶅姟鍚堝悓id",
"type": "integer"
+ },
+ "serviceMan": {
+ "description": "鏈嶅姟浜哄憳",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.User"
+ }
+ ]
},
"serviceManId": {
"description": "鏈嶅姟浜哄憳",
@@ -12852,6 +13008,9 @@
"timeSpentId": {
"description": "鑺辫垂鏃堕棿",
"type": "integer"
+ },
+ "updateTime": {
+ "type": "string"
}
}
},
@@ -13774,6 +13933,14 @@
"description": "璐︽埛id",
"type": "integer"
},
+ "client": {
+ "description": "瀹㈡埛id",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.Client"
+ }
+ ]
+ },
"clientId": {
"description": "瀹㈡埛id",
"type": "integer"
@@ -14230,6 +14397,12 @@
"salesDetailsId": {
"type": "integer"
},
+ "serviceContractStatusId": {
+ "type": "integer"
+ },
+ "serviceContractTypeId": {
+ "type": "integer"
+ },
"serviceTimes": {
"type": "integer"
},
@@ -14252,10 +14425,10 @@
},
"request.AddServiceContractStatus": {
"type": "object",
- "required": [
- "name"
- ],
"properties": {
+ "id": {
+ "type": "integer"
+ },
"name": {
"type": "string"
}
@@ -14473,9 +14646,13 @@
"description": "闂鎻忚堪",
"type": "string"
},
- "productId": {
- "description": "浜у搧id",
- "type": "integer"
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productTypeName": {
+ "description": "浜у搧鍒嗙被鍚嶇О",
+ "type": "string"
},
"realTime": {
"description": "瀹為檯澶勭悊鏃堕棿",
@@ -14856,6 +15033,17 @@
}
}
},
+ "request.DeleteContract": {
+ "type": "object",
+ "properties": {
+ "ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ }
+ }
+ },
"request.DeleteCountry": {
"type": "object",
"properties": {
@@ -14876,7 +15064,40 @@
}
}
},
+ "request.DeleteMasterOrder": {
+ "type": "object",
+ "properties": {
+ "ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ }
+ }
+ },
"request.DeleteOrderManage": {
+ "type": "object",
+ "properties": {
+ "ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ }
+ }
+ },
+ "request.DeleteQuotation": {
+ "type": "object",
+ "properties": {
+ "ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ }
+ }
+ },
+ "request.DeleteSaleChance": {
"type": "object",
"properties": {
"ids": {
@@ -14910,6 +15131,17 @@
}
},
"request.DeleteServiceFollowup": {
+ "type": "object",
+ "properties": {
+ "ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ }
+ }
+ },
+ "request.DeleteSubOrder": {
"type": "object",
"properties": {
"ids": {
@@ -15015,7 +15247,7 @@
"type": "integer"
},
"search_map": {
- "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\"}",
+ "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\",\"representative\": \"娉曞畾浠ｈ〃浜篭", \"registration_time\": \"娉ㄥ唽鏃堕棿\", \"business_scope\": \"缁忚惀鑼冨洿\", \"remark\": \"澶囨敞\"}",
"type": "object",
"additionalProperties": true
}
@@ -15033,7 +15265,7 @@
"type": "integer"
},
"search_map": {
- "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\", \"is_first\": \"鏄惁鏄瑕佽仈绯讳汉\"}",
+ "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\", \"is_first\": \"鏄惁鏄瑕佽仈绯讳汉\", \"client_id\": \"clientId 鐢ㄤ簬杩斿洖棣栬鑱旂郴浜篭"}",
"type": "object",
"additionalProperties": true
}
@@ -16768,6 +17000,14 @@
"description": "璐︽埛id",
"type": "integer"
},
+ "client": {
+ "description": "瀹㈡埛id",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.Client"
+ }
+ ]
+ },
"clientId": {
"description": "瀹㈡埛id",
"type": "integer"
@@ -17446,6 +17686,12 @@
"salesDetailsId": {
"type": "integer"
},
+ "serviceContractStatusId": {
+ "type": "integer"
+ },
+ "serviceContractTypeId": {
+ "type": "integer"
+ },
"serviceTimes": {
"type": "integer"
},
@@ -17468,30 +17714,12 @@
},
"request.UpdateServiceContractStatus": {
"type": "object",
- "required": [
- "id",
- "name"
- ],
"properties": {
"id": {
"type": "integer"
},
"name": {
"type": "string"
- }
- }
- },
- "request.UpdateServiceContractStatuss": {
- "type": "object",
- "required": [
- "service_contract_status"
- ],
- "properties": {
- "service_contract_status": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/request.UpdateServiceContractStatus"
- }
}
}
},
@@ -17732,9 +17960,13 @@
"description": "闂鎻忚堪",
"type": "string"
},
- "productId": {
- "description": "浜у搧id",
- "type": "integer"
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productTypeName": {
+ "description": "浜у搧鍒嗙被鍚嶇О",
+ "type": "string"
},
"realTime": {
"description": "瀹為檯澶勭悊鏃堕棿",
@@ -18779,17 +19011,6 @@
"type": "array",
"items": {
"$ref": "#/definitions/model.Satisfaction"
- }
- }
- }
- },
- "response.ServiceContractStatusResponse": {
- "type": "object",
- "properties": {
- "list": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/model.ServiceContractStatus"
}
}
}
--
Gitblit v1.8.0