From 0b3bcdad216e73b43dec04db4a4792efefef0e37 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 17 八月 2023 10:09:03 +0800
Subject: [PATCH] Merge branch 'zq'
---
docs/docs.go | 222 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 187 insertions(+), 35 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 6282947..0b42ee2 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -6777,6 +6777,36 @@
}
}
},
+ "/api/salesDetails/delete": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "SalesDetails 閿�鍞槑缁�"
+ ],
+ "summary": "鎵归噺鍒犻櫎閿�鍞槑缁�",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.CommonIds"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
"/api/salesDetails/delete/{id}": {
"delete": {
"produces": [
@@ -7045,7 +7075,7 @@
"application/json"
],
"tags": [
- "SalesRefund"
+ "閿�鍞��娆惧崟"
],
"summary": "娣诲姞閿�鍞��娆�",
"parameters": [
@@ -7069,13 +7099,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": [
@@ -7103,7 +7163,7 @@
"application/json"
],
"tags": [
- "SalesRefund"
+ "閿�鍞��娆惧崟"
],
"summary": "閿�鍞��娆惧崟鍒楄〃",
"parameters": [
@@ -7145,7 +7205,7 @@
"application/json"
],
"tags": [
- "SalesRefund"
+ "閿�鍞��娆惧崟"
],
"summary": "鏇存柊閿�鍞��娆�",
"parameters": [
@@ -7175,7 +7235,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "娣诲姞閿�鍞��璐�",
"parameters": [
@@ -7199,13 +7259,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": [
@@ -7233,7 +7323,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "閿�鍞��璐у崟鍒楄〃",
"parameters": [
@@ -7275,7 +7365,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "鏇存柊閿�鍞��璐�",
"parameters": [
@@ -7824,15 +7914,15 @@
"tags": [
"ServiceContract"
],
- "summary": "鍒犻櫎鏈嶅姟鍚堝悓",
+ "summary": "鎵归噺鍒犻櫎鏈嶅姟鍚堝悓",
"parameters": [
{
- "description": "鏌ヨ鍙傛暟",
+ "description": "鍙傛暟",
"name": "object",
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.DeleteServiceContract"
+ "$ref": "#/definitions/request.CommonIds"
}
}
],
@@ -8437,6 +8527,36 @@
"required": true,
"schema": {
"$ref": "#/definitions/request.AddServiceOrder"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api/serviceOrder/delete": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈嶅姟鍗�"
+ ],
+ "summary": "鎵归噺鍒犻櫎鏈嶅姟鍗�",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.CommonIds"
}
}
],
@@ -12166,7 +12286,7 @@
"type": "integer"
},
"sourceType": {
- "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
+ "description": "鏉ユ簮绫诲瀷锛�1閿�鍞��璐э級",
"allOf": [
{
"$ref": "#/definitions/constvar.RefundSourceType"
@@ -12653,12 +12773,13 @@
"description": "闂鎻忚堪",
"type": "string"
},
- "product": {
- "$ref": "#/definitions/model.Product"
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
},
- "productId": {
- "description": "浜у搧id",
- "type": "integer"
+ "productTypeName": {
+ "description": "浜у搧鍒嗙被鍚嶇О",
+ "type": "string"
},
"realTime": {
"description": "瀹為檯澶勭悊鏃堕棿",
@@ -13024,6 +13145,10 @@
},
"contact": {
"$ref": "#/definitions/request.Contact"
+ },
+ "contact_id": {
+ "description": "鑱旂郴浜篒D",
+ "type": "integer"
},
"country_id": {
"type": "integer"
@@ -14177,6 +14302,10 @@
"contact": {
"$ref": "#/definitions/request.Contact"
},
+ "contact_id": {
+ "description": "鑱旂郴浜篒D",
+ "type": "integer"
+ },
"country_id": {
"type": "integer"
},
@@ -14345,9 +14474,13 @@
"description": "闂鎻忚堪",
"type": "string"
},
- "productId": {
- "description": "浜у搧id",
- "type": "integer"
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productTypeName": {
+ "description": "浜у搧鍒嗙被鍚嶇О",
+ "type": "string"
},
"realTime": {
"description": "瀹為檯澶勭悊鏃堕棿",
@@ -14626,6 +14759,20 @@
}
}
},
+ "request.CommonIds": {
+ "type": "object",
+ "required": [
+ "ids"
+ ],
+ "properties": {
+ "ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ }
+ }
+ },
"request.Contact": {
"type": "object",
"properties": {
@@ -14746,17 +14893,6 @@
}
},
"request.DeleteSalesLeads": {
- "type": "object",
- "properties": {
- "ids": {
- "type": "array",
- "items": {
- "type": "integer"
- }
- }
- }
- },
- "request.DeleteServiceContract": {
"type": "object",
"properties": {
"ids": {
@@ -15451,6 +15587,10 @@
},
"request.SalesRefund": {
"type": "object",
+ "required": [
+ "sourceId",
+ "sourceType"
+ ],
"properties": {
"bankAccountId": {
"description": "璐︽埛id",
@@ -15489,7 +15629,7 @@
"type": "integer"
},
"sourceType": {
- "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
+ "description": "鏉ユ簮绫诲瀷锛�1閿�鍞��娆惧崟锛�",
"allOf": [
{
"$ref": "#/definitions/constvar.RefundSourceType"
@@ -15701,6 +15841,10 @@
},
"contact": {
"$ref": "#/definitions/request.Contact"
+ },
+ "contact_id": {
+ "description": "鑱旂郴浜篒D",
+ "type": "integer"
},
"country_id": {
"type": "integer"
@@ -17414,6 +17558,10 @@
"contact": {
"$ref": "#/definitions/request.Contact"
},
+ "contact_id": {
+ "description": "鑱旂郴浜篒D",
+ "type": "integer"
+ },
"country_id": {
"type": "integer"
},
@@ -17589,9 +17737,13 @@
"description": "闂鎻忚堪",
"type": "string"
},
- "productId": {
- "description": "浜у搧id",
- "type": "integer"
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productTypeName": {
+ "description": "浜у搧鍒嗙被鍚嶇О",
+ "type": "string"
},
"realTime": {
"description": "瀹為檯澶勭悊鏃堕棿",
--
Gitblit v1.8.0