From f264456b1e4fd284f53ecc4c70a3b951578bfd2d Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 17:13:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
docs/docs.go | 256 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 209 insertions(+), 47 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 57597d2..aa37bdd 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": {
@@ -7075,7 +7083,7 @@
"application/json"
],
"tags": [
- "SalesRefund"
+ "閿�鍞��娆惧崟"
],
"summary": "娣诲姞閿�鍞��娆�",
"parameters": [
@@ -7099,13 +7107,43 @@
}
}
},
+ "/api/salesRefund/delete": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "閿�鍞��娆惧崟"
+ ],
+ "summary": "鎵归噺鍒犻櫎閿�鍞��娆惧崟",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.CommonIds"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
"/api/salesRefund/delete/{id}": {
"delete": {
"produces": [
"application/json"
],
"tags": [
- "SalesRefund"
+ "閿�鍞��娆惧崟"
],
"summary": "鍒犻櫎閿�鍞��娆�",
"parameters": [
@@ -7133,7 +7171,7 @@
"application/json"
],
"tags": [
- "SalesRefund"
+ "閿�鍞��娆惧崟"
],
"summary": "閿�鍞��娆惧崟鍒楄〃",
"parameters": [
@@ -7175,7 +7213,7 @@
"application/json"
],
"tags": [
- "SalesRefund"
+ "閿�鍞��娆惧崟"
],
"summary": "鏇存柊閿�鍞��娆�",
"parameters": [
@@ -7205,7 +7243,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "娣诲姞閿�鍞��璐�",
"parameters": [
@@ -7229,13 +7267,43 @@
}
}
},
+ "/api/salesReturn/delete": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "閿�鍞��璐у崟"
+ ],
+ "summary": "鎵归噺鍒犻櫎閿�鍞��璐у崟",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.CommonIds"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
"/api/salesReturn/delete/{id}": {
"delete": {
"produces": [
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "鍒犻櫎閿�鍞��璐�",
"parameters": [
@@ -7263,7 +7331,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "閿�鍞��璐у崟鍒楄〃",
"parameters": [
@@ -7305,7 +7373,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "鏇存柊閿�鍞��璐�",
"parameters": [
@@ -9276,7 +9344,7 @@
}
}
},
- "/api/subOrder/delete/{id}": {
+ "/api/subOrder/delete": {
"delete": {
"produces": [
"application/json"
@@ -9287,11 +9355,13 @@
"summary": "鍒犻櫎瀛愯鍗�",
"parameters": [
{
- "type": "integer",
"description": "鏌ヨ鍙傛暟",
- "name": "id",
- "in": "path",
- "required": true
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.DeleteSubOrder"
+ }
}
],
"responses": {
@@ -10681,6 +10751,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"
},
@@ -10726,6 +10800,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"
},
@@ -10748,6 +10829,7 @@
}
},
"id": {
+ "description": "The ID of the item\nexample: 1",
"type": "integer"
},
"industry": {
@@ -10803,6 +10885,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"
}
}
},
@@ -12226,7 +12312,7 @@
"type": "integer"
},
"sourceType": {
- "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
+ "description": "鏉ユ簮绫诲瀷锛�1閿�鍞��璐э級",
"allOf": [
{
"$ref": "#/definitions/constvar.RefundSourceType"
@@ -12713,12 +12799,13 @@
"description": "闂鎻忚堪",
"type": "string"
},
- "product": {
- "$ref": "#/definitions/model.Product"
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
},
- "productId": {
- "description": "浜у搧id",
- "type": "integer"
+ "productTypeName": {
+ "description": "浜у搧鍒嗙被鍚嶇О",
+ "type": "string"
},
"realTime": {
"description": "瀹為檯澶勭悊鏃堕棿",
@@ -12748,6 +12835,14 @@
"serviceContractId": {
"description": "鏈嶅姟鍚堝悓id",
"type": "integer"
+ },
+ "serviceMan": {
+ "description": "鏈嶅姟浜哄憳",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.User"
+ }
+ ]
},
"serviceManId": {
"description": "鏈嶅姟浜哄憳",
@@ -14413,9 +14508,13 @@
"description": "闂鎻忚堪",
"type": "string"
},
- "productId": {
- "description": "浜у搧id",
- "type": "integer"
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productTypeName": {
+ "description": "浜у搧鍒嗙被鍚嶇О",
+ "type": "string"
},
"realTime": {
"description": "瀹為檯澶勭悊鏃堕棿",
@@ -14796,6 +14895,17 @@
}
}
},
+ "request.DeleteContract": {
+ "type": "object",
+ "properties": {
+ "ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ }
+ }
+ },
"request.DeleteCountry": {
"type": "object",
"properties": {
@@ -14816,7 +14926,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": {
@@ -14850,6 +14993,17 @@
}
},
"request.DeleteServiceFollowup": {
+ "type": "object",
+ "properties": {
+ "ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ }
+ }
+ },
+ "request.DeleteSubOrder": {
"type": "object",
"properties": {
"ids": {
@@ -15031,7 +15185,7 @@
"type": "integer"
},
"search_map": {
- "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"topic\": \"璺熻繘涓婚\", \"member_name\": \"璺熻繘浜篭", \"client_name\": \"瀹㈡埛鍚嶇О\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"follow_time\": \"璺熻繘鏃堕棿\", \"next_follow_time\": \"涓嬫璺熻繘鏃堕棿\", \"record\": \"璺熻繘璁板綍\", \"phone\": \"鑱旂郴浜虹數璇漒", \"contact_name\": \"鑱旂郴浜哄鍚峔"}",
+ "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"topic\": \"璺熻繘涓婚\", \"member_name\": \"璺熻繘浜篭", \"client_name\": \"瀹㈡埛鍚嶇О\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"follow_time\": \"璺熻繘鏃堕棿\", \"next_follow_time\": \"涓嬫璺熻繘鏃堕棿\", \"record\": \"璺熻繘璁板綍\", \"phone\": \"鑱旂郴浜虹數璇漒", \"contact_name\": \"鑱旂郴浜哄鍚峔", \"sales_leads_id\": \"閿�鍞嚎绱d\", \"sale_chance_id\": \"閿�鍞満浼歩d\"}",
"type": "object",
"additionalProperties": true
}
@@ -15522,6 +15676,10 @@
},
"request.SalesRefund": {
"type": "object",
+ "required": [
+ "sourceId",
+ "sourceType"
+ ],
"properties": {
"bankAccountId": {
"description": "璐︽埛id",
@@ -15560,7 +15718,7 @@
"type": "integer"
},
"sourceType": {
- "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
+ "description": "鏉ユ簮绫诲瀷锛�1閿�鍞��娆惧崟锛�",
"allOf": [
{
"$ref": "#/definitions/constvar.RefundSourceType"
@@ -17668,9 +17826,13 @@
"description": "闂鎻忚堪",
"type": "string"
},
- "productId": {
- "description": "浜у搧id",
- "type": "integer"
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productTypeName": {
+ "description": "浜у搧鍒嗙被鍚嶇О",
+ "type": "string"
},
"realTime": {
"description": "瀹為檯澶勭悊鏃堕棿",
--
Gitblit v1.8.0