From 06c0b03df2955475fe39ff2a793a5f151f4da99f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 17 八月 2023 19:25:30 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
docs/docs.go | 454 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 407 insertions(+), 47 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 57239a8..b27e16a 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -664,6 +664,36 @@
}
}
},
+ "/api/client/checkName": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Client"
+ ],
+ "summary": "妫�鏌ュ鎴峰悕绉版槸鍚﹂噸澶�",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.CheckClientName"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
"/api/client/delete": {
"delete": {
"produces": [
@@ -1490,6 +1520,37 @@
"description": "OK",
"schema": {
"$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/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"
+ }
+ }
+ }
+ ]
}
}
}
@@ -6716,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": [
@@ -6984,7 +7075,7 @@
"application/json"
],
"tags": [
- "SalesRefund"
+ "閿�鍞��娆惧崟"
],
"summary": "娣诲姞閿�鍞��娆�",
"parameters": [
@@ -7008,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": [
@@ -7042,7 +7163,7 @@
"application/json"
],
"tags": [
- "SalesRefund"
+ "閿�鍞��娆惧崟"
],
"summary": "閿�鍞��娆惧崟鍒楄〃",
"parameters": [
@@ -7084,7 +7205,7 @@
"application/json"
],
"tags": [
- "SalesRefund"
+ "閿�鍞��娆惧崟"
],
"summary": "鏇存柊閿�鍞��娆�",
"parameters": [
@@ -7114,7 +7235,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "娣诲姞閿�鍞��璐�",
"parameters": [
@@ -7138,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": [
@@ -7172,7 +7323,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "閿�鍞��璐у崟鍒楄〃",
"parameters": [
@@ -7214,7 +7365,7 @@
"application/json"
],
"tags": [
- "SalesReturn"
+ "閿�鍞��璐у崟"
],
"summary": "鏇存柊閿�鍞��璐�",
"parameters": [
@@ -7763,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"
}
}
],
@@ -8376,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"
}
}
],
@@ -10233,6 +10414,29 @@
"SalesRefundKeywordPriceTotal"
]
},
+ "constvar.SalesReturnKeywordType": {
+ "type": "string",
+ "enum": [
+ "閿�鍞��璐у崟缂栧彿",
+ "瀹㈡埛鍚嶇О",
+ "閫�娆炬棩鏈�",
+ "鐘舵��",
+ "閫�鍏ヤ粨搴�",
+ "搴旈��娆�",
+ "宸查��娆�",
+ "閿�鍞礋璐ｄ汉"
+ ],
+ "x-enum-varnames": [
+ "SalesReturnKeywordReturnNumber",
+ "SalesReturnKeywordClientName",
+ "SalesReturnKeywordReturnDate",
+ "SalesReturnKeywordStatus",
+ "SalesReturnKeywordRepository",
+ "SalesReturnKeywordAmountShouldRefund",
+ "SalesReturnKeywordAmountHasRefund",
+ "SalesReturnKeywordPrincipal"
+ ]
+ },
"constvar.SalesReturnSourceType": {
"type": "integer",
"enum": [
@@ -10709,16 +10913,16 @@
"model.CollectionProjection": {
"type": "object",
"properties": {
+ "_": {
+ "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
+ "type": "string"
+ },
"created_at": {
"description": "The date when the item was created\nexample: 2023-08-10 15:48:25",
"type": "string"
},
"creator": {
"type": "integer"
- },
- "deleted_at": {
- "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
- "type": "string"
},
"estimated_collection_amount": {
"type": "number"
@@ -10774,6 +10978,9 @@
},
"is_first": {
"type": "boolean"
+ },
+ "member": {
+ "$ref": "#/definitions/model.User"
},
"member_id": {
"type": "integer"
@@ -10849,6 +11056,9 @@
"is_first": {
"type": "boolean"
},
+ "member": {
+ "$ref": "#/definitions/model.User"
+ },
"member_id": {
"type": "integer"
},
@@ -10881,17 +11091,43 @@
}
}
},
+ "model.ContactInformation": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+ },
"model.Contract": {
"type": "object",
"properties": {
+ "_": {
+ "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
+ "type": "string"
+ },
+ "client": {
+ "$ref": "#/definitions/model.Client"
+ },
"clientId": {
"type": "integer"
+ },
+ "created_at": {
+ "description": "The date when the item was created\nexample: 2023-08-10 15:48:25",
+ "type": "string"
},
"file": {
"type": "string"
},
"id": {
+ "description": "The ID of the item\nexample: 1",
"type": "integer"
+ },
+ "member": {
+ "$ref": "#/definitions/model.User"
},
"memberId": {
"type": "integer"
@@ -10907,6 +11143,10 @@
},
"statusId": {
"type": "integer"
+ },
+ "updated_at": {
+ "description": "The date when the item was last updated\nexample: 2023-08-10 15:48:25",
+ "type": "string"
}
}
},
@@ -11013,6 +11253,9 @@
"client_id": {
"type": "integer"
},
+ "client_status": {
+ "$ref": "#/definitions/model.ClientStatus"
+ },
"client_status_id": {
"type": "integer"
},
@@ -11052,8 +11295,14 @@
"record": {
"type": "string"
},
+ "sale_chance": {
+ "$ref": "#/definitions/model.SaleChance"
+ },
"sale_chance_id": {
"type": "integer"
+ },
+ "sales_leads": {
+ "$ref": "#/definitions/model.SalesLeads"
},
"sales_leads_id": {
"type": "integer"
@@ -11210,6 +11459,9 @@
},
"id": {
"type": "integer"
+ },
+ "member": {
+ "$ref": "#/definitions/model.User"
},
"member_id": {
"type": "integer"
@@ -11442,6 +11694,9 @@
"id": {
"type": "integer"
},
+ "member": {
+ "$ref": "#/definitions/model.User"
+ },
"member_id": {
"type": "integer"
},
@@ -11453,6 +11708,9 @@
"items": {
"$ref": "#/definitions/model.Product"
}
+ },
+ "quotation_status": {
+ "$ref": "#/definitions/model.QuotationStatus"
},
"quotation_status_id": {
"type": "integer"
@@ -11681,6 +11939,9 @@
"key_maker": {
"type": "string"
},
+ "member": {
+ "$ref": "#/definitions/model.User"
+ },
"member_id": {
"type": "integer"
},
@@ -11698,6 +11959,9 @@
},
"possibilities_id": {
"type": "integer"
+ },
+ "possibility": {
+ "$ref": "#/definitions/model.Possibility"
},
"process": {
"type": "string"
@@ -11717,19 +11981,28 @@
"region_id": {
"type": "integer"
},
+ "regular_customers": {
+ "$ref": "#/definitions/model.RegularCustomers"
+ },
"regular_customers_id": {
"type": "integer"
},
"remark": {
"type": "string"
},
+ "sale_stage": {
+ "$ref": "#/definitions/model.SaleStage"
+ },
"sale_stage_id": {
"type": "integer"
+ },
+ "sale_type": {
+ "$ref": "#/definitions/model.SaleType"
},
"sale_type_id": {
"type": "integer"
},
- "salesSources": {
+ "sales_sources": {
"$ref": "#/definitions/model.SalesSources"
},
"sales_sources_id": {
@@ -11910,6 +12183,9 @@
"id": {
"type": "integer"
},
+ "member": {
+ "$ref": "#/definitions/model.User"
+ },
"member_id": {
"type": "integer"
},
@@ -11933,6 +12209,9 @@
},
"region_id": {
"type": "integer"
+ },
+ "sales_sources": {
+ "$ref": "#/definitions/model.SalesSources"
},
"sales_sources_id": {
"type": "integer"
@@ -11972,7 +12251,7 @@
"type": "integer"
},
"isInvoice": {
- "type": "integer"
+ "type": "string"
},
"member": {
"$ref": "#/definitions/model.User"
@@ -12007,7 +12286,7 @@
"type": "integer"
},
"sourceType": {
- "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
+ "description": "鏉ユ簮绫诲瀷锛�1閿�鍞��璐э級",
"allOf": [
{
"$ref": "#/definitions/constvar.RefundSourceType"
@@ -12029,6 +12308,14 @@
"$ref": "#/definitions/model.SalesReturnStatus"
}
]
+ },
+ "amountHasRefund": {
+ "description": "宸查��娆鹃噾棰�",
+ "type": "number"
+ },
+ "amountShouldRefund": {
+ "description": "搴旈��娆鹃噾棰�",
+ "type": "number"
},
"client": {
"$ref": "#/definitions/model.Client"
@@ -12239,6 +12526,9 @@
},
"id": {
"type": "integer"
+ },
+ "member": {
+ "$ref": "#/definitions/model.User"
},
"memberId": {
"type": "integer"
@@ -12483,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": "瀹為檯澶勭悊鏃堕棿",
@@ -12518,6 +12809,14 @@
"serviceContractId": {
"description": "鏈嶅姟鍚堝悓id",
"type": "integer"
+ },
+ "serviceMan": {
+ "description": "鏈嶅姟浜哄憳",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.User"
+ }
+ ]
},
"serviceManId": {
"description": "鏈嶅姟浜哄憳",
@@ -12632,8 +12931,14 @@
"id": {
"type": "integer"
},
+ "masterOrder": {
+ "$ref": "#/definitions/model.MasterOrder"
+ },
"masterOrderId": {
"type": "integer"
+ },
+ "member": {
+ "$ref": "#/definitions/model.User"
},
"memberId": {
"type": "integer"
@@ -12848,6 +13153,10 @@
},
"contact": {
"$ref": "#/definitions/request.Contact"
+ },
+ "contact_id": {
+ "description": "鑱旂郴浜篒D",
+ "type": "integer"
},
"country_id": {
"type": "integer"
@@ -14001,6 +14310,10 @@
"contact": {
"$ref": "#/definitions/request.Contact"
},
+ "contact_id": {
+ "description": "鑱旂郴浜篒D",
+ "type": "integer"
+ },
"country_id": {
"type": "integer"
},
@@ -14169,9 +14482,13 @@
"description": "闂鎻忚堪",
"type": "string"
},
- "productId": {
- "description": "浜у搧id",
- "type": "integer"
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productTypeName": {
+ "description": "浜у搧鍒嗙被鍚嶇О",
+ "type": "string"
},
"realTime": {
"description": "瀹為檯澶勭悊鏃堕棿",
@@ -14442,6 +14759,28 @@
}
}
},
+ "request.CheckClientName": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "type": "string"
+ }
+ }
+ },
+ "request.CommonIds": {
+ "type": "object",
+ "required": [
+ "ids"
+ ],
+ "properties": {
+ "ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ }
+ }
+ },
"request.Contact": {
"type": "object",
"properties": {
@@ -14562,17 +14901,6 @@
}
},
"request.DeleteSalesLeads": {
- "type": "object",
- "properties": {
- "ids": {
- "type": "array",
- "items": {
- "type": "integer"
- }
- }
- }
- },
- "request.DeleteServiceContract": {
"type": "object",
"properties": {
"ids": {
@@ -14727,9 +15055,6 @@
"request.GetContractList": {
"type": "object",
"properties": {
- "keyword": {
- "type": "string"
- },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -14737,6 +15062,11 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ },
+ "search_map": {
+ "description": "鎼滅储鏉′欢: map[string]interface{} {\"member_name\": \"閿�鍞礋璐ｄ汉\", \"number\": \"鍚堝悓缂栧彿\", \"created_at\": \"鍒涘缓鏃堕棿\"}",
+ "type": "object",
+ "additionalProperties": true
}
}
},
@@ -14774,7 +15104,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
}
@@ -14841,7 +15171,7 @@
"description": "姣忛〉澶у皬",
"type": "integer"
},
- "searchMap": {
+ "search_map": {
"description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 閿�鍞嚎绱d, \"client_name\": \"瀹㈡埛鍚嶇О\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"contact_name\": \"鑱旂郴浜篭", \"validity_date\": \"鏈夋晥鏈焅"}",
"type": "object",
"additionalProperties": true
@@ -14927,6 +15257,9 @@
"properties": {
"keyword": {
"type": "string"
+ },
+ "keywordType": {
+ "$ref": "#/definitions/constvar.SalesReturnKeywordType"
},
"page": {
"description": "椤电爜",
@@ -15262,6 +15595,10 @@
},
"request.SalesRefund": {
"type": "object",
+ "required": [
+ "sourceId",
+ "sourceType"
+ ],
"properties": {
"bankAccountId": {
"description": "璐︽埛id",
@@ -15271,7 +15608,7 @@
"type": "integer"
},
"isInvoice": {
- "type": "integer"
+ "type": "string"
},
"memberId": {
"type": "integer"
@@ -15300,7 +15637,7 @@
"type": "integer"
},
"sourceType": {
- "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
+ "description": "鏉ユ簮绫诲瀷锛�1閿�鍞��娆惧崟锛�",
"allOf": [
{
"$ref": "#/definitions/constvar.RefundSourceType"
@@ -15512,6 +15849,10 @@
},
"contact": {
"$ref": "#/definitions/request.Contact"
+ },
+ "contact_id": {
+ "description": "鑱旂郴浜篒D",
+ "type": "integer"
},
"country_id": {
"type": "integer"
@@ -17225,6 +17566,10 @@
"contact": {
"$ref": "#/definitions/request.Contact"
},
+ "contact_id": {
+ "description": "鑱旂郴浜篒D",
+ "type": "integer"
+ },
"country_id": {
"type": "integer"
},
@@ -17400,9 +17745,13 @@
"description": "闂鎻忚堪",
"type": "string"
},
- "productId": {
- "description": "浜у搧id",
- "type": "integer"
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productTypeName": {
+ "description": "浜у搧鍒嗙被鍚嶇О",
+ "type": "string"
},
"realTime": {
"description": "瀹為檯澶勭悊鏃堕棿",
@@ -17725,6 +18074,17 @@
}
}
},
+ "response.ContactInformationResponse": {
+ "type": "object",
+ "properties": {
+ "list": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.ContactInformation"
+ }
+ }
+ }
+ },
"response.ContactResponse": {
"type": "object",
"properties": {
--
Gitblit v1.8.0