From 1b8811fe5024ad4e2d744a98dc9a49d65bb87a3b Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 16 八月 2023 09:40:19 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
docs/docs.go | 198 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 182 insertions(+), 16 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index ebddcb8..57597d2 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1525,6 +1525,37 @@
}
}
},
+ "/api/contactInformation/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "ContactInformation"
+ ],
+ "summary": "鑱旂郴鏂瑰紡鍒楄〃",
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.ContactInformationResponse"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api/contract/add": {
"post": {
"produces": [
@@ -6746,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": [
@@ -7793,15 +7854,15 @@
"tags": [
"ServiceContract"
],
- "summary": "鍒犻櫎鏈嶅姟鍚堝悓",
+ "summary": "鎵归噺鍒犻櫎鏈嶅姟鍚堝悓",
"parameters": [
{
- "description": "鏌ヨ鍙傛暟",
+ "description": "鍙傛暟",
"name": "object",
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.DeleteServiceContract"
+ "$ref": "#/definitions/request.CommonIds"
}
}
],
@@ -8406,6 +8467,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"
}
}
],
@@ -10263,6 +10354,29 @@
"SalesRefundKeywordPriceTotal"
]
},
+ "constvar.SalesReturnKeywordType": {
+ "type": "string",
+ "enum": [
+ "閿�鍞��璐у崟缂栧彿",
+ "瀹㈡埛鍚嶇О",
+ "閫�娆炬棩鏈�",
+ "鐘舵��",
+ "閫�鍏ヤ粨搴�",
+ "搴旈��娆�",
+ "宸查��娆�",
+ "閿�鍞礋璐ｄ汉"
+ ],
+ "x-enum-varnames": [
+ "SalesReturnKeywordReturnNumber",
+ "SalesReturnKeywordClientName",
+ "SalesReturnKeywordReturnDate",
+ "SalesReturnKeywordStatus",
+ "SalesReturnKeywordRepository",
+ "SalesReturnKeywordAmountShouldRefund",
+ "SalesReturnKeywordAmountHasRefund",
+ "SalesReturnKeywordPrincipal"
+ ]
+ },
"constvar.SalesReturnSourceType": {
"type": "integer",
"enum": [
@@ -10913,6 +11027,17 @@
"type": "integer"
},
"wechat": {
+ "type": "string"
+ }
+ }
+ },
+ "model.ContactInformation": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "name": {
"type": "string"
}
}
@@ -12066,7 +12191,7 @@
"type": "integer"
},
"isInvoice": {
- "type": "integer"
+ "type": "string"
},
"member": {
"$ref": "#/definitions/model.User"
@@ -12123,6 +12248,14 @@
"$ref": "#/definitions/model.SalesReturnStatus"
}
]
+ },
+ "amountHasRefund": {
+ "description": "宸查��娆鹃噾棰�",
+ "type": "number"
+ },
+ "amountShouldRefund": {
+ "description": "搴旈��娆鹃噾棰�",
+ "type": "number"
},
"client": {
"$ref": "#/definitions/model.Client"
@@ -12951,6 +13084,10 @@
},
"contact": {
"$ref": "#/definitions/request.Contact"
+ },
+ "contact_id": {
+ "description": "鑱旂郴浜篒D",
+ "type": "integer"
},
"country_id": {
"type": "integer"
@@ -14104,6 +14241,10 @@
"contact": {
"$ref": "#/definitions/request.Contact"
},
+ "contact_id": {
+ "description": "鑱旂郴浜篒D",
+ "type": "integer"
+ },
"country_id": {
"type": "integer"
},
@@ -14553,6 +14694,20 @@
}
}
},
+ "request.CommonIds": {
+ "type": "object",
+ "required": [
+ "ids"
+ ],
+ "properties": {
+ "ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ }
+ }
+ },
"request.Contact": {
"type": "object",
"properties": {
@@ -14673,17 +14828,6 @@
}
},
"request.DeleteSalesLeads": {
- "type": "object",
- "properties": {
- "ids": {
- "type": "array",
- "items": {
- "type": "integer"
- }
- }
- }
- },
- "request.DeleteServiceContract": {
"type": "object",
"properties": {
"ids": {
@@ -15041,6 +15185,9 @@
"keyword": {
"type": "string"
},
+ "keywordType": {
+ "$ref": "#/definitions/constvar.SalesReturnKeywordType"
+ },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -15384,7 +15531,7 @@
"type": "integer"
},
"isInvoice": {
- "type": "integer"
+ "type": "string"
},
"memberId": {
"type": "integer"
@@ -15625,6 +15772,10 @@
},
"contact": {
"$ref": "#/definitions/request.Contact"
+ },
+ "contact_id": {
+ "description": "鑱旂郴浜篒D",
+ "type": "integer"
},
"country_id": {
"type": "integer"
@@ -17338,6 +17489,10 @@
"contact": {
"$ref": "#/definitions/request.Contact"
},
+ "contact_id": {
+ "description": "鑱旂郴浜篒D",
+ "type": "integer"
+ },
"country_id": {
"type": "integer"
},
@@ -17838,6 +17993,17 @@
}
}
},
+ "response.ContactInformationResponse": {
+ "type": "object",
+ "properties": {
+ "list": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.ContactInformation"
+ }
+ }
+ }
+ },
"response.ContactResponse": {
"type": "object",
"properties": {
--
Gitblit v1.8.0