From f84d9c46574a2cd663105859035bc17891270923 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 10:41:54 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
docs/swagger.json | 552 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 465 insertions(+), 87 deletions(-)
diff --git a/docs/swagger.json b/docs/swagger.json
index cc9cc72..45cc390 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -1230,6 +1230,127 @@
}
}
},
+ "/api/collectionProjection/add": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "CollectionProjection"
+ ],
+ "summary": "娣诲姞鏀舵棰勬祴",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddCollectionProjection"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api/collectionProjection/delete/{id}": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "CollectionProjection"
+ ],
+ "summary": "鍒犻櫎鏀舵棰勬祴",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "鏌ヨ鍙傛暟",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api/collectionProjection/list": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "CollectionProjection"
+ ],
+ "summary": "鑾峰彇鏀舵棰勬祴鍒楄〃",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api/collectionProjection/update": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "CollectionProjection"
+ ],
+ "summary": "鏇存柊鏀舵棰勬祴",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateCollectionProjection"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
"/api/contact/add": {
"post": {
"produces": [
@@ -6255,6 +6376,36 @@
}
}
},
+ "/api/saleChance/push": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "SaleChance"
+ ],
+ "summary": "鎺ㄨ繘閿�鍞満浼�",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.PushSaleChance"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
"/api/saleChance/update": {
"put": {
"produces": [
@@ -10016,6 +10167,18 @@
"ReceiptSourceTypeChuKuDan"
]
},
+ "constvar.RefundSourceType": {
+ "type": "integer",
+ "enum": [
+ 1
+ ],
+ "x-enum-comments": {
+ "RefundSourceTypeSalesReturn": "閿�鍞��璐�"
+ },
+ "x-enum-varnames": [
+ "RefundSourceTypeSalesReturn"
+ ]
+ },
"constvar.SalesDetailsKeywordType": {
"type": "string",
"enum": [
@@ -10031,6 +10194,31 @@
"SalesDetailsKeywordTypeSignTime",
"SalesDetailsKeywordTypePrincipal",
"SalesDetailsKeywordTypeProductName"
+ ]
+ },
+ "constvar.SalesRefundKeywordType": {
+ "type": "string",
+ "enum": [
+ "閿�鍞��璐у崟缂栧彿",
+ "瀹㈡埛鍚嶇О",
+ "閫�娆炬棩鏈�",
+ "璐︽埛",
+ "鏄惁寮�绁�",
+ "浠樻鏂瑰紡",
+ "閿�鍞礋璐ｄ汉",
+ "淇敼鏃堕棿",
+ "浠风◣鍚堣"
+ ],
+ "x-enum-varnames": [
+ "SalesRefundKeywordRefundNumber",
+ "SalesRefundKeywordClientName",
+ "SalesRefundKeywordRefundDate",
+ "SalesRefundKeywordAccount",
+ "SalesRefundKeywordIsInvoice",
+ "SalesRefundKeywordPaymentType",
+ "SalesRefundKeywordPrincipal",
+ "SalesRefundKeywordUpdateAt",
+ "SalesRefundKeywordPriceTotal"
]
},
"constvar.SalesReturnSourceType": {
@@ -10506,6 +10694,42 @@
}
}
},
+ "model.CollectionProjection": {
+ "type": "object",
+ "properties": {
+ "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"
+ },
+ "estimated_collection_date": {
+ "type": "string"
+ },
+ "id": {
+ "description": "The ID of the item\nexample: 1",
+ "type": "integer"
+ },
+ "modifier": {
+ "type": "integer"
+ },
+ "sale_chance_id": {
+ "type": "integer"
+ },
+ "updated_at": {
+ "description": "The date when the item was last updated\nexample: 2023-08-10 15:48:25",
+ "type": "string"
+ }
+ }
+ },
"model.Contact": {
"type": "object",
"properties": {
@@ -10710,32 +10934,6 @@
},
"name": {
"type": "string"
- }
- }
- },
- "model.CustomerServiceSheet": {
- "type": "object",
- "properties": {
- "handleStatus": {
- "type": "integer"
- },
- "id": {
- "type": "integer"
- },
- "memberId": {
- "type": "integer"
- },
- "number": {
- "type": "string"
- },
- "priority": {
- "type": "integer"
- },
- "serviceFollowupId": {
- "type": "integer"
- },
- "serviceMode": {
- "type": "integer"
}
}
},
@@ -11238,6 +11436,12 @@
"number": {
"type": "string"
},
+ "products": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.Product"
+ }
+ },
"quotation_status_id": {
"type": "integer"
},
@@ -11270,6 +11474,9 @@
"description": "鏀舵閲戦",
"type": "number"
},
+ "bankAccount": {
+ "$ref": "#/definitions/model.BankAccount"
+ },
"bankAccountId": {
"description": "璐︽埛id",
"type": "integer"
@@ -11289,9 +11496,20 @@
"description": "甯佺",
"type": "string"
},
+ "paymentType": {
+ "$ref": "#/definitions/model.PaymentType"
+ },
"paymentTypeId": {
"description": "鏀舵鏂瑰紡ID",
"type": "integer"
+ },
+ "principal": {
+ "description": "璐熻矗浜篿d",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.User"
+ }
+ ]
},
"principalId": {
"description": "璐熻矗浜篿d",
@@ -11408,6 +11626,12 @@
},
"client_id": {
"type": "integer"
+ },
+ "collection_projections": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.CollectionProjection"
+ }
},
"competitors": {
"type": "string"
@@ -11709,11 +11933,28 @@
"model.SalesRefund": {
"type": "object",
"properties": {
- "accountId": {
+ "amountTotal": {
+ "description": "浠风◣鍚堣",
+ "type": "number"
+ },
+ "bankAccount": {
+ "$ref": "#/definitions/model.BankAccount"
+ },
+ "bankAccountId": {
+ "description": "璐︽埛id",
"type": "integer"
+ },
+ "client": {
+ "$ref": "#/definitions/model.Client"
},
"clientId": {
"type": "integer"
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "creatorName": {
+ "type": "string"
},
"id": {
"type": "integer"
@@ -11721,11 +11962,21 @@
"isInvoice": {
"type": "integer"
},
+ "member": {
+ "$ref": "#/definitions/model.User"
+ },
"memberId": {
"type": "integer"
},
"number": {
"type": "string"
+ },
+ "paymentType": {
+ "$ref": "#/definitions/model.PaymentType"
+ },
+ "paymentTypeId": {
+ "description": "鏀舵鏂瑰紡ID",
+ "type": "integer"
},
"products": {
"type": "array",
@@ -11739,8 +11990,17 @@
"refundDate": {
"type": "string"
},
- "refundMethod": {
- "type": "string"
+ "sourceId": {
+ "description": "婧愬崟id",
+ "type": "integer"
+ },
+ "sourceType": {
+ "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.RefundSourceType"
+ }
+ ]
}
}
},
@@ -12090,9 +12350,6 @@
"contactId": {
"type": "integer"
},
- "customerServiceSheet": {
- "$ref": "#/definitions/model.CustomerServiceSheet"
- },
"file": {
"type": "string"
},
@@ -12129,11 +12386,11 @@
"satisfactionId": {
"type": "integer"
},
- "serviceId": {
- "type": "integer"
- },
"serviceOrder": {
"$ref": "#/definitions/model.ServiceOrder"
+ },
+ "serviceOrderId": {
+ "type": "integer"
},
"solveRate": {
"$ref": "#/definitions/model.SolveRate"
@@ -12182,13 +12439,6 @@
"description": "鑱旂郴浜篿d",
"type": "integer"
},
- "contract": {
- "$ref": "#/definitions/model.Contract"
- },
- "contractId": {
- "description": "鍚堝悓id",
- "type": "integer"
- },
"expectTime": {
"description": "甯屾湜澶勭悊鏃堕棿",
"type": "string"
@@ -12209,13 +12459,6 @@
},
"id": {
"type": "integer"
- },
- "orderId": {
- "description": "閿�鍞鍗昳d",
- "type": "integer"
- },
- "orderManage": {
- "$ref": "#/definitions/model.OrderManage"
},
"priorityLevel": {
"$ref": "#/definitions/model.PriorityLevel"
@@ -12248,6 +12491,20 @@
},
"saleChanceId": {
"description": "閿�鍞満浼歩d",
+ "type": "integer"
+ },
+ "salesDetails": {
+ "$ref": "#/definitions/model.SalesDetails"
+ },
+ "salesDetailsId": {
+ "description": "閿�鍞槑缁唅d",
+ "type": "integer"
+ },
+ "serviceContract": {
+ "$ref": "#/definitions/model.ServiceContract"
+ },
+ "serviceContractId": {
+ "description": "鏈嶅姟鍚堝悓id",
"type": "integer"
},
"serviceManId": {
@@ -12681,6 +12938,23 @@
"properties": {
"name": {
"type": "string"
+ }
+ }
+ },
+ "request.AddCollectionProjection": {
+ "type": "object",
+ "properties": {
+ "estimated_collection_amount": {
+ "description": "棰勮鏀舵閲戦",
+ "type": "number"
+ },
+ "estimated_collection_time": {
+ "description": "棰勮鏀舵鏃堕棿",
+ "type": "string"
+ },
+ "sale_chance_id": {
+ "description": "閿�鍞満浼歩d",
+ "type": "integer"
}
}
},
@@ -13146,6 +13420,12 @@
"number": {
"type": "string"
},
+ "products": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.Product"
+ }
+ },
"quotation_status_id": {
"type": "integer"
},
@@ -13175,6 +13455,9 @@
"description": "鏀舵閲戦",
"type": "number"
},
+ "bankAccount": {
+ "$ref": "#/definitions/model.BankAccount"
+ },
"bankAccountId": {
"description": "璐︽埛id",
"type": "integer"
@@ -13194,9 +13477,20 @@
"description": "甯佺",
"type": "string"
},
+ "paymentType": {
+ "$ref": "#/definitions/model.PaymentType"
+ },
"paymentTypeId": {
"description": "鏀舵鏂瑰紡ID",
"type": "integer"
+ },
+ "principal": {
+ "description": "璐熻矗浜篿d",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.User"
+ }
+ ]
},
"principalId": {
"description": "璐熻矗浜篿d",
@@ -13805,7 +14099,7 @@
"satisfaction": {
"type": "integer"
},
- "serviceId": {
+ "serviceOrderId": {
"type": "integer"
},
"solveRate": {
@@ -13843,10 +14137,6 @@
"description": "鑱旂郴浜篿d",
"type": "integer"
},
- "contractId": {
- "description": "鍚堝悓id",
- "type": "integer"
- },
"expectTime": {
"description": "甯屾湜澶勭悊鏃堕棿",
"type": "string"
@@ -13857,10 +14147,6 @@
},
"faultTypeId": {
"description": "鏁呴殰绫诲埆id",
- "type": "integer"
- },
- "orderId": {
- "description": "閿�鍞鍗昳d",
"type": "integer"
},
"priorityLevelId": {
@@ -13887,6 +14173,14 @@
"description": "閿�鍞満浼歩d",
"type": "integer"
},
+ "salesDetailsId": {
+ "description": "閿�鍞鍗昳d",
+ "type": "integer"
+ },
+ "serviceContractId": {
+ "description": "鍚堝悓id",
+ "type": "integer"
+ },
"serviceManId": {
"description": "鏈嶅姟浜哄憳",
"type": "integer"
@@ -13894,6 +14188,10 @@
"serviceNumber": {
"description": "鏈嶅姟鍗曠紪鍙�",
"type": "string"
+ },
+ "serviceOrderStatusId": {
+ "description": "澶勭悊鐘舵��",
+ "type": "integer"
},
"serviceTypeId": {
"description": "鏈嶅姟鏂瑰紡id",
@@ -13910,10 +14208,6 @@
"solutionRemark": {
"description": "鍐呴儴澶囨敞",
"type": "string"
- },
- "status": {
- "description": "澶勭悊鐘舵��",
- "type": "integer"
},
"subject": {
"description": "涓婚",
@@ -14477,9 +14771,6 @@
"request.GetMasterOrderList": {
"type": "object",
"properties": {
- "keyword": {
- "type": "string"
- },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -14487,6 +14778,11 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ },
+ "search_map": {
+ "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"number\": \"閿�鍞�诲崟鍙穃", \"client_name\": \"瀹㈡埛鍚嶇О\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"start_time\": \"寮�濮嬫椂闂碶", \"end_time\": \"缁撴潫鏃堕棿\", \"money\": \"鎬婚噾棰漒", \"member_name\": \"璐熻矗浜篭"}",
+ "type": "object",
+ "additionalProperties": true
}
}
},
@@ -14525,9 +14821,6 @@
"request.GetQuotationList": {
"type": "object",
"properties": {
- "keyword": {
- "type": "string"
- },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -14535,15 +14828,17 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ },
+ "searchMap": {
+ "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 閿�鍞嚎绱d, \"client_name\": \"瀹㈡埛鍚嶇О\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"contact_name\": \"鑱旂郴浜篭", \"validity_date\": \"鏈夋晥鏈焅"}",
+ "type": "object",
+ "additionalProperties": true
}
}
},
"request.GetSaleChanceList": {
"type": "object",
"properties": {
- "keyword": {
- "type": "string"
- },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -14551,6 +14846,11 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ },
+ "search_map": {
+ "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"鏈轰細鍚嶇О\", \"client_name\": \"瀹㈡埛鍚嶇О\",\"number\":\"缂栧彿\", \"contact_name\":\"鑱旂郴浜哄鍚峔", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"status\": \"鐘舵�乗", \"sale_stage\": \"闃舵\", \"possibilities\": \"鍙兘鎬", \"expected_time\": \"棰勮鎴愪氦鏃堕棿\", \"budget\": \"璧勯噾缁濆鍊糪", \"projected_amount\": \"棰勮鍚堝悓閲戦\"}",
+ "type": "object",
+ "additionalProperties": true
}
}
},
@@ -14596,6 +14896,9 @@
"properties": {
"keyword": {
"type": "string"
+ },
+ "keywordType": {
+ "$ref": "#/definitions/constvar.SalesRefundKeywordType"
},
"page": {
"description": "椤电爜",
@@ -14683,6 +14986,10 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ },
+ "serviceOrderId": {
+ "description": "鏈嶅姟鍥炶鍗昳d",
+ "type": "integer"
}
}
},
@@ -14705,6 +15012,12 @@
},
"queryClass": {
"$ref": "#/definitions/constvar.ServiceOrderQueryClass"
+ },
+ "salesDetailsId": {
+ "type": "integer"
+ },
+ "serviceContractId": {
+ "type": "integer"
}
}
},
@@ -14790,6 +15103,21 @@
"type": "string"
},
"subOrderId": {
+ "type": "integer"
+ }
+ }
+ },
+ "request.PushSaleChance": {
+ "type": "object",
+ "required": [
+ "id",
+ "step"
+ ],
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "step": {
"type": "integer"
}
}
@@ -14921,7 +15249,8 @@
"request.SalesRefund": {
"type": "object",
"properties": {
- "accountId": {
+ "bankAccountId": {
+ "description": "璐︽埛id",
"type": "integer"
},
"clientId": {
@@ -14936,6 +15265,10 @@
"number": {
"type": "string"
},
+ "paymentTypeId": {
+ "description": "鏀舵鏂瑰紡ID",
+ "type": "integer"
+ },
"products": {
"type": "array",
"items": {
@@ -14948,8 +15281,17 @@
"refundDate": {
"type": "string"
},
- "refundMethod": {
- "type": "string"
+ "sourceId": {
+ "description": "婧愬崟id",
+ "type": "integer"
+ },
+ "sourceType": {
+ "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.RefundSourceType"
+ }
+ ]
}
}
},
@@ -15341,6 +15683,22 @@
"items": {
"$ref": "#/definitions/request.UpdateClientType"
}
+ }
+ }
+ },
+ "request.UpdateCollectionProjection": {
+ "type": "object",
+ "properties": {
+ "estimated_collection_amount": {
+ "description": "棰勮鏀舵閲戦",
+ "type": "number"
+ },
+ "estimated_collection_time": {
+ "description": "棰勮鏀舵鏃堕棿",
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
}
}
},
@@ -16008,6 +16366,12 @@
"number": {
"type": "string"
},
+ "products": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.Product"
+ }
+ },
"quotation_status_id": {
"type": "integer"
},
@@ -16055,6 +16419,9 @@
"description": "鏀舵閲戦",
"type": "number"
},
+ "bankAccount": {
+ "$ref": "#/definitions/model.BankAccount"
+ },
"bankAccountId": {
"description": "璐︽埛id",
"type": "integer"
@@ -16074,9 +16441,20 @@
"description": "甯佺",
"type": "string"
},
+ "paymentType": {
+ "$ref": "#/definitions/model.PaymentType"
+ },
"paymentTypeId": {
"description": "鏀舵鏂瑰紡ID",
"type": "integer"
+ },
+ "principal": {
+ "description": "璐熻矗浜篿d",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.User"
+ }
+ ]
},
"principalId": {
"description": "璐熻矗浜篿d",
@@ -16947,7 +17325,7 @@
"satisfaction": {
"type": "integer"
},
- "serviceId": {
+ "serviceOrderId": {
"type": "integer"
},
"solveRate": {
@@ -16985,10 +17363,6 @@
"description": "鑱旂郴浜篿d",
"type": "integer"
},
- "contractId": {
- "description": "鍚堝悓id",
- "type": "integer"
- },
"expectTime": {
"description": "甯屾湜澶勭悊鏃堕棿",
"type": "string"
@@ -17002,10 +17376,6 @@
"type": "integer"
},
"id": {
- "type": "integer"
- },
- "orderId": {
- "description": "閿�鍞鍗昳d",
"type": "integer"
},
"priorityLevelId": {
@@ -17032,6 +17402,14 @@
"description": "閿�鍞満浼歩d",
"type": "integer"
},
+ "salesDetailsId": {
+ "description": "閿�鍞鍗昳d",
+ "type": "integer"
+ },
+ "serviceContractId": {
+ "description": "鍚堝悓id",
+ "type": "integer"
+ },
"serviceManId": {
"description": "鏈嶅姟浜哄憳",
"type": "integer"
@@ -17039,6 +17417,10 @@
"serviceNumber": {
"description": "鏈嶅姟鍗曠紪鍙�",
"type": "string"
+ },
+ "serviceOrderStatusId": {
+ "description": "澶勭悊鐘舵��",
+ "type": "integer"
},
"serviceTypeId": {
"description": "鏈嶅姟鏂瑰紡id",
@@ -17055,10 +17437,6 @@
"solutionRemark": {
"description": "鍐呴儴澶囨敞",
"type": "string"
- },
- "status": {
- "description": "澶勭悊鐘舵��",
- "type": "integer"
},
"subject": {
"description": "涓婚",
--
Gitblit v1.8.0