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/docs.go | 1085 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 930 insertions(+), 155 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 5b72437..71f27c6 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1242,6 +1242,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": [
@@ -6267,6 +6388,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": [
@@ -8267,7 +8418,7 @@
}
},
"/api/serviceOrder/list": {
- "get": {
+ "post": {
"produces": [
"application/json"
],
@@ -8277,57 +8428,13 @@
"summary": "鑾峰彇鏈嶅姟鍗曞垪琛�",
"parameters": [
{
- "type": "string",
- "name": "keyword",
- "in": "query"
- },
- {
- "enum": [
- "鏈嶅姟鍗曠紪鍙�",
- "涓婚",
- "瀹㈡埛鍚嶇О",
- "瀹為檯澶勭悊鏃堕棿",
- "鏈嶅姟浜哄憳",
- "鏈嶅姟鏂瑰紡",
- "浜у搧绫诲埆",
- "鏁呴殰绫诲埆"
- ],
- "type": "string",
- "x-enum-varnames": [
- "ServiceOrderKeywordOrderNumber",
- "ServiceOrderKeywordSubject",
- "ServiceOrderKeywordClientName",
- "ServiceOrderKeywordRealProcessTime",
- "ServiceOrderKeywordServiceMan",
- "ServiceOrderKeywordServiceType",
- "ServiceOrderKeywordProductType",
- "ServiceOrderKeywordFaultType"
- ],
- "name": "keywordType",
- "in": "query"
- },
- {
- "type": "integer",
- "description": "椤电爜",
- "name": "page",
- "in": "query"
- },
- {
- "type": "integer",
- "description": "姣忛〉澶у皬",
- "name": "pageSize",
- "in": "query"
- },
- {
- "enum": [
- ""
- ],
- "type": "string",
- "x-enum-varnames": [
- "ServiceOrderQueryClassExpireLessThen60Days"
- ],
- "name": "queryClass",
- "in": "query"
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetServiceOrderList"
+ }
}
],
"responses": {
@@ -8372,6 +8479,169 @@
"required": true,
"schema": {
"$ref": "#/definitions/request.UpdateServiceOrder"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api/serviceOrderStatus/add": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈嶅姟鍗曠姸鎬�"
+ ],
+ "summary": "娣诲姞鏈嶅姟鍗曠姸鎬�",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddServiceOrderStatus"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api/serviceOrderStatus/delete/{id}": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈嶅姟鍗曠姸鎬�"
+ ],
+ "summary": "鍒犻櫎鏈嶅姟鍗曠姸鎬�",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "鏌ヨ鍙傛暟",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api/serviceOrderStatus/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈嶅姟鍗曠姸鎬�"
+ ],
+ "summary": "鑾峰彇鏈嶅姟鍗曠姸鎬佸垪琛�",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "keyword",
+ "in": "query"
+ },
+ {
+ "enum": [
+ ""
+ ],
+ "type": "string",
+ "x-enum-varnames": [
+ "ServiceOrderStatusKeywordCustomerName"
+ ],
+ "name": "keywordType",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "enum": [
+ ""
+ ],
+ "type": "string",
+ "x-enum-varnames": [
+ "ServiceOrderStatusQueryClassExpireLessThen60Days"
+ ],
+ "name": "queryClass",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/response.ListResponse"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.ServiceOrderStatus"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api/serviceOrderStatus/update": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏈嶅姟鍗曠姸鎬�"
+ ],
+ "summary": "鏇存柊鏈嶅姟鍗曠姸鎬�",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateServiceOrderStatus"
}
}
],
@@ -9722,18 +9992,36 @@
"BankAccountQueryClassExpireLessThen60Days"
]
},
- "constvar.CollectionStatus": {
+ "constvar.CollectionSourceType": {
"type": "integer",
"enum": [
1,
2
],
"x-enum-comments": {
+ "CollectionSourceTypeSaleDetails": "閿�鍞槑缁�",
+ "CollectionSourceTypeServiceContract": "鏈嶅姟鍚堝悓"
+ },
+ "x-enum-varnames": [
+ "CollectionSourceTypeSaleDetails",
+ "CollectionSourceTypeServiceContract"
+ ]
+ },
+ "constvar.CollectionStatus": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "x-enum-comments": {
"CollectionStatusCollected": "宸叉敹娆�",
+ "CollectionStatusSubCollected": "閮ㄥ垎鏀舵",
"CollectionStatusUnCollected": "寰呮敹娆�"
},
"x-enum-varnames": [
"CollectionStatusUnCollected",
+ "CollectionStatusSubCollected",
"CollectionStatusCollected"
]
},
@@ -9874,6 +10162,35 @@
"ReceiptQueryClassExpireLessThen60Days"
]
},
+ "constvar.ReceiptSourceType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3,
+ 4,
+ 5
+ ],
+ "x-enum-varnames": [
+ "ReceiptSourceTypeSalesDetails",
+ "ReceiptSourceTypeServiceContract",
+ "ReceiptSourceTypeInvoice",
+ "ReceiptSourceTypeCollectionPlan",
+ "ReceiptSourceTypeChuKuDan"
+ ]
+ },
+ "constvar.RefundSourceType": {
+ "type": "integer",
+ "enum": [
+ 1
+ ],
+ "x-enum-comments": {
+ "RefundSourceTypeSalesReturn": "閿�鍞��璐�"
+ },
+ "x-enum-varnames": [
+ "RefundSourceTypeSalesReturn"
+ ]
+ },
"constvar.SalesDetailsKeywordType": {
"type": "string",
"enum": [
@@ -9889,6 +10206,43 @@
"SalesDetailsKeywordTypeSignTime",
"SalesDetailsKeywordTypePrincipal",
"SalesDetailsKeywordTypeProductName"
+ ]
+ },
+ "constvar.SalesRefundKeywordType": {
+ "type": "string",
+ "enum": [
+ "閿�鍞��璐у崟缂栧彿",
+ "瀹㈡埛鍚嶇О",
+ "閫�娆炬棩鏈�",
+ "璐︽埛",
+ "鏄惁寮�绁�",
+ "浠樻鏂瑰紡",
+ "閿�鍞礋璐ｄ汉",
+ "淇敼鏃堕棿",
+ "浠风◣鍚堣"
+ ],
+ "x-enum-varnames": [
+ "SalesRefundKeywordRefundNumber",
+ "SalesRefundKeywordClientName",
+ "SalesRefundKeywordRefundDate",
+ "SalesRefundKeywordAccount",
+ "SalesRefundKeywordIsInvoice",
+ "SalesRefundKeywordPaymentType",
+ "SalesRefundKeywordPrincipal",
+ "SalesRefundKeywordUpdateAt",
+ "SalesRefundKeywordPriceTotal"
+ ]
+ },
+ "constvar.SalesReturnSourceType": {
+ "type": "integer",
+ "enum": [
+ 1
+ ],
+ "x-enum-comments": {
+ "SalesReturnSourceTypeSaleDetails": "閿�鍞槑缁�"
+ },
+ "x-enum-varnames": [
+ "SalesReturnSourceTypeSaleDetails"
]
},
"constvar.SalesStatus": {
@@ -10050,6 +10404,24 @@
],
"x-enum-varnames": [
"ServiceOrderQueryClassExpireLessThen60Days"
+ ]
+ },
+ "constvar.ServiceOrderStatusKeywordType": {
+ "type": "string",
+ "enum": [
+ ""
+ ],
+ "x-enum-varnames": [
+ "ServiceOrderStatusKeywordCustomerName"
+ ]
+ },
+ "constvar.ServiceOrderStatusQueryClass": {
+ "type": "string",
+ "enum": [
+ ""
+ ],
+ "x-enum-varnames": [
+ "ServiceOrderStatusQueryClassExpireLessThen60Days"
]
},
"constvar.UserType": {
@@ -10334,6 +10706,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": {
@@ -10538,32 +10946,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"
}
}
},
@@ -11066,6 +11448,12 @@
"number": {
"type": "string"
},
+ "products": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.Product"
+ }
+ },
"quotation_status_id": {
"type": "integer"
},
@@ -11094,6 +11482,13 @@
"model.Receipt": {
"type": "object",
"properties": {
+ "amount": {
+ "description": "鏀舵閲戦",
+ "type": "number"
+ },
+ "bankAccount": {
+ "$ref": "#/definitions/model.BankAccount"
+ },
"bankAccountId": {
"description": "璐︽埛id",
"type": "integer"
@@ -11113,9 +11508,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",
@@ -11135,7 +11541,11 @@
},
"sourceType": {
"description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
- "type": "integer"
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.ReceiptSourceType"
+ }
+ ]
}
}
},
@@ -11228,6 +11638,12 @@
},
"client_id": {
"type": "integer"
+ },
+ "collection_projections": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.CollectionProjection"
+ }
},
"competitors": {
"type": "string"
@@ -11358,6 +11774,9 @@
"model.SalesDetails": {
"type": "object",
"properties": {
+ "Member": {
+ "$ref": "#/definitions/model.User"
+ },
"address": {
"type": "string"
},
@@ -11376,6 +11795,10 @@
"description": "宸叉敹閲戦",
"type": "number"
},
+ "amountTotal": {
+ "description": "浠风◣鍚堣",
+ "type": "number"
+ },
"amountUnInvoiced": {
"description": "鏈紑绁ㄩ噾棰�",
"type": "number"
@@ -11387,6 +11810,15 @@
"type": "integer"
},
"conditions": {
+ "type": "string"
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "creatorId": {
+ "type": "integer"
+ },
+ "creatorName": {
"type": "string"
},
"deliveryDate": {
@@ -11513,11 +11945,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"
@@ -11525,11 +11974,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",
@@ -11543,16 +12002,45 @@
"refundDate": {
"type": "string"
},
- "refundMethod": {
- "type": "string"
+ "sourceId": {
+ "description": "婧愬崟id",
+ "type": "integer"
+ },
+ "sourceType": {
+ "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.RefundSourceType"
+ }
+ ]
}
}
},
"model.SalesReturn": {
"type": "object",
"properties": {
+ "Member": {
+ "$ref": "#/definitions/model.User"
+ },
+ "SalesReturnStatus": {
+ "description": "閫�璐х姸鎬�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.SalesReturnStatus"
+ }
+ ]
+ },
+ "client": {
+ "$ref": "#/definitions/model.Client"
+ },
"clientId": {
"type": "integer"
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "creatorName": {
+ "type": "string"
},
"id": {
"type": "integer"
@@ -11564,22 +12052,38 @@
"type": "string"
},
"products": {
+ "description": "閫�璐т骇鍝�",
"type": "array",
"items": {
"$ref": "#/definitions/model.Product"
}
},
"reason": {
+ "description": "閫�璐у師鍥�",
"type": "string"
},
"repository": {
"type": "string"
},
"returnDate": {
+ "description": "閫�璐ф棩鏈�",
"type": "string"
},
- "salesReturnStatus": {
+ "salesReturnStatusId": {
+ "description": "閫�璐х姸鎬乮d",
"type": "integer"
+ },
+ "sourceId": {
+ "description": "婧愬崟id",
+ "type": "integer"
+ },
+ "sourceType": {
+ "description": "婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.SalesReturnSourceType"
+ }
+ ]
}
}
},
@@ -11623,6 +12127,18 @@
"description": "閲戦",
"type": "number"
},
+ "amountReceivable": {
+ "description": "搴旀敹閲戦",
+ "type": "number"
+ },
+ "amountReceived": {
+ "description": "宸叉敹閲戦",
+ "type": "number"
+ },
+ "amountTotal": {
+ "description": "鎬婚",
+ "type": "number"
+ },
"collectionDate": {
"description": "璁″垝鏀舵鏃ユ湡",
"type": "string"
@@ -11660,10 +12176,14 @@
},
"sourceType": {
"description": "婧愬崟绫诲瀷锛�1閿�鍞槑缁�2鏈嶅姟鍚堝悓3閿�鍞彂绁級",
- "type": "integer"
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.CollectionSourceType"
+ }
+ ]
},
"status": {
- "description": "鐘舵�侊紙1鏈敹2宸叉敹锛�",
+ "description": "鐘舵�侊紙1鏈敹2閮ㄥ垎宸叉敹3宸叉敹锛�",
"allOf": [
{
"$ref": "#/definitions/constvar.CollectionStatus"
@@ -11694,6 +12214,10 @@
"description": "宸叉敹閲戦",
"type": "number"
},
+ "amountTotal": {
+ "description": "浠风◣鍚堣",
+ "type": "number"
+ },
"amountUnInvoiced": {
"description": "鏈紑绁ㄩ噾棰�",
"type": "number"
@@ -11703,6 +12227,9 @@
},
"clientId": {
"type": "integer"
+ },
+ "contact": {
+ "$ref": "#/definitions/model.Contact"
},
"contactId": {
"type": "integer"
@@ -11820,20 +12347,29 @@
"model.ServiceFollowup": {
"type": "object",
"properties": {
+ "Member": {
+ "$ref": "#/definitions/model.User"
+ },
+ "client": {
+ "$ref": "#/definitions/model.Client"
+ },
"clientId": {
"type": "integer"
},
+ "contact": {
+ "$ref": "#/definitions/model.Contact"
+ },
"contactId": {
"type": "integer"
- },
- "customerServiceSheet": {
- "$ref": "#/definitions/model.CustomerServiceSheet"
},
"file": {
"type": "string"
},
"id": {
"type": "integer"
+ },
+ "isVisit": {
+ "$ref": "#/definitions/model.IsVisit"
},
"isVisitId": {
"type": "integer"
@@ -11844,6 +12380,9 @@
"number": {
"type": "string"
},
+ "oldMember": {
+ "$ref": "#/definitions/model.User"
+ },
"oldMemberId": {
"type": "integer"
},
@@ -11853,17 +12392,26 @@
"remark": {
"type": "string"
},
- "satisfactionId": {
- "type": "integer"
+ "satisfaction": {
+ "$ref": "#/definitions/model.Satisfaction"
},
- "serviceId": {
+ "satisfactionId": {
"type": "integer"
},
"serviceOrder": {
"$ref": "#/definitions/model.ServiceOrder"
},
+ "serviceOrderId": {
+ "type": "integer"
+ },
+ "solveRate": {
+ "$ref": "#/definitions/model.SolveRate"
+ },
"solveRateId": {
"type": "integer"
+ },
+ "timelyRate": {
+ "$ref": "#/definitions/model.TimelyRate"
},
"timelyRateId": {
"type": "integer"
@@ -11882,11 +12430,11 @@
"type": "string"
},
"carFare": {
- "description": "浜ら�氳垂",
+ "description": "浜ら�氳垂 // 浜ら�氳垂",
"type": "number"
},
"chargeAmount": {
- "description": "鏀惰垂閲戦",
+ "description": "鏀惰垂閲戦 // 鏀惰垂閲戦",
"type": "number"
},
"client": {
@@ -11901,13 +12449,6 @@
},
"contactId": {
"description": "鑱旂郴浜篿d",
- "type": "integer"
- },
- "contract": {
- "$ref": "#/definitions/model.Contract"
- },
- "contractId": {
- "description": "鍚堝悓id",
"type": "integer"
},
"expectTime": {
@@ -11930,13 +12471,6 @@
},
"id": {
"type": "integer"
- },
- "orderId": {
- "description": "閿�鍞鍗昳d",
- "type": "integer"
- },
- "orderManage": {
- "$ref": "#/definitions/model.OrderManage"
},
"priorityLevel": {
"$ref": "#/definitions/model.PriorityLevel"
@@ -11971,6 +12505,20 @@
"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": {
"description": "鏈嶅姟浜哄憳",
"type": "integer"
@@ -11978,6 +12526,13 @@
"serviceNumber": {
"description": "鏈嶅姟鍗曠紪鍙�",
"type": "string"
+ },
+ "serviceOrderStatus": {
+ "$ref": "#/definitions/model.ServiceOrderStatus"
+ },
+ "serviceOrderStatusId": {
+ "description": "澶勭悊鐘舵��",
+ "type": "integer"
},
"serviceType": {
"$ref": "#/definitions/model.ServiceType"
@@ -11997,10 +12552,6 @@
"description": "鍐呴儴澶囨敞",
"type": "string"
},
- "status": {
- "description": "澶勭悊鐘舵��",
- "type": "integer"
- },
"subject": {
"description": "涓婚",
"type": "string"
@@ -12011,6 +12562,17 @@
"timeSpentId": {
"description": "鑺辫垂鏃堕棿",
"type": "integer"
+ }
+ }
+ },
+ "model.ServiceOrderStatus": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "type": "string"
}
}
},
@@ -12388,6 +12950,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"
}
}
},
@@ -12853,6 +13432,12 @@
"number": {
"type": "string"
},
+ "products": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.Product"
+ }
+ },
"quotation_status_id": {
"type": "integer"
},
@@ -12878,6 +13463,13 @@
"request.AddReceipt": {
"type": "object",
"properties": {
+ "amount": {
+ "description": "鏀舵閲戦",
+ "type": "number"
+ },
+ "bankAccount": {
+ "$ref": "#/definitions/model.BankAccount"
+ },
"bankAccountId": {
"description": "璐︽埛id",
"type": "integer"
@@ -12897,9 +13489,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",
@@ -12919,7 +13522,11 @@
},
"sourceType": {
"description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
- "type": "integer"
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.ReceiptSourceType"
+ }
+ ]
}
}
},
@@ -13504,7 +14111,7 @@
"satisfaction": {
"type": "integer"
},
- "serviceId": {
+ "serviceOrderId": {
"type": "integer"
},
"solveRate": {
@@ -13542,10 +14149,6 @@
"description": "鑱旂郴浜篿d",
"type": "integer"
},
- "contractId": {
- "description": "鍚堝悓id",
- "type": "integer"
- },
"expectTime": {
"description": "甯屾湜澶勭悊鏃堕棿",
"type": "string"
@@ -13556,10 +14159,6 @@
},
"faultTypeId": {
"description": "鏁呴殰绫诲埆id",
- "type": "integer"
- },
- "orderId": {
- "description": "閿�鍞鍗昳d",
"type": "integer"
},
"priorityLevelId": {
@@ -13586,6 +14185,14 @@
"description": "閿�鍞満浼歩d",
"type": "integer"
},
+ "salesDetailsId": {
+ "description": "閿�鍞鍗昳d",
+ "type": "integer"
+ },
+ "serviceContractId": {
+ "description": "鍚堝悓id",
+ "type": "integer"
+ },
"serviceManId": {
"description": "鏈嶅姟浜哄憳",
"type": "integer"
@@ -13593,6 +14200,10 @@
"serviceNumber": {
"description": "鏈嶅姟鍗曠紪鍙�",
"type": "string"
+ },
+ "serviceOrderStatusId": {
+ "description": "澶勭悊鐘舵��",
+ "type": "integer"
},
"serviceTypeId": {
"description": "鏈嶅姟鏂瑰紡id",
@@ -13610,10 +14221,6 @@
"description": "鍐呴儴澶囨敞",
"type": "string"
},
- "status": {
- "description": "澶勭悊鐘舵��",
- "type": "integer"
- },
"subject": {
"description": "涓婚",
"type": "string"
@@ -13621,6 +14228,17 @@
"timeSpentId": {
"description": "鑺辫垂鏃堕棿",
"type": "integer"
+ }
+ }
+ },
+ "request.AddServiceOrderStatus": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "type": "string"
}
}
},
@@ -14165,9 +14783,6 @@
"request.GetMasterOrderList": {
"type": "object",
"properties": {
- "keyword": {
- "type": "string"
- },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -14175,6 +14790,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
}
}
},
@@ -14213,9 +14833,6 @@
"request.GetQuotationList": {
"type": "object",
"properties": {
- "keyword": {
- "type": "string"
- },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -14223,15 +14840,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"
@@ -14239,6 +14858,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
}
}
},
@@ -14284,6 +14908,9 @@
"properties": {
"keyword": {
"type": "string"
+ },
+ "keywordType": {
+ "$ref": "#/definitions/constvar.SalesRefundKeywordType"
},
"page": {
"description": "椤电爜",
@@ -14371,6 +14998,38 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ },
+ "serviceOrderId": {
+ "description": "鏈嶅姟鍥炶鍗昳d",
+ "type": "integer"
+ }
+ }
+ },
+ "request.GetServiceOrderList": {
+ "type": "object",
+ "properties": {
+ "keyword": {
+ "type": "string"
+ },
+ "keywordType": {
+ "$ref": "#/definitions/constvar.ServiceOrderKeywordType"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "queryClass": {
+ "$ref": "#/definitions/constvar.ServiceOrderQueryClass"
+ },
+ "salesDetailsId": {
+ "type": "integer"
+ },
+ "serviceContractId": {
+ "type": "integer"
}
}
},
@@ -14456,6 +15115,21 @@
"type": "string"
},
"subOrderId": {
+ "type": "integer"
+ }
+ }
+ },
+ "request.PushSaleChance": {
+ "type": "object",
+ "required": [
+ "id",
+ "step"
+ ],
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "step": {
"type": "integer"
}
}
@@ -14587,7 +15261,8 @@
"request.SalesRefund": {
"type": "object",
"properties": {
- "accountId": {
+ "bankAccountId": {
+ "description": "璐︽埛id",
"type": "integer"
},
"clientId": {
@@ -14602,6 +15277,10 @@
"number": {
"type": "string"
},
+ "paymentTypeId": {
+ "description": "鏀舵鏂瑰紡ID",
+ "type": "integer"
+ },
"products": {
"type": "array",
"items": {
@@ -14614,8 +15293,17 @@
"refundDate": {
"type": "string"
},
- "refundMethod": {
- "type": "string"
+ "sourceId": {
+ "description": "婧愬崟id",
+ "type": "integer"
+ },
+ "sourceType": {
+ "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.RefundSourceType"
+ }
+ ]
}
}
},
@@ -14632,22 +15320,38 @@
"type": "string"
},
"products": {
+ "description": "閫�璐т骇鍝�",
"type": "array",
"items": {
"$ref": "#/definitions/model.Product"
}
},
"reason": {
+ "description": "閫�璐у師鍥�",
"type": "string"
},
"repository": {
"type": "string"
},
"returnDate": {
+ "description": "閫�璐ф棩鏈�",
"type": "string"
},
- "status": {
+ "salesReturnStatusId": {
+ "description": "閫�璐х姸鎬乮d",
"type": "integer"
+ },
+ "sourceId": {
+ "description": "婧愬崟id",
+ "type": "integer"
+ },
+ "sourceType": {
+ "description": "婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.SalesReturnSourceType"
+ }
+ ]
}
}
},
@@ -14991,6 +15695,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"
}
}
},
@@ -15658,6 +16378,12 @@
"number": {
"type": "string"
},
+ "products": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.Product"
+ }
+ },
"quotation_status_id": {
"type": "integer"
},
@@ -15701,6 +16427,13 @@
"request.UpdateReceipt": {
"type": "object",
"properties": {
+ "amount": {
+ "description": "鏀舵閲戦",
+ "type": "number"
+ },
+ "bankAccount": {
+ "$ref": "#/definitions/model.BankAccount"
+ },
"bankAccountId": {
"description": "璐︽埛id",
"type": "integer"
@@ -15720,9 +16453,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",
@@ -15742,7 +16486,11 @@
},
"sourceType": {
"description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
- "type": "integer"
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.ReceiptSourceType"
+ }
+ ]
}
}
},
@@ -16257,6 +17005,18 @@
"description": "閲戦",
"type": "number"
},
+ "amountReceivable": {
+ "description": "搴旀敹閲戦",
+ "type": "number"
+ },
+ "amountReceived": {
+ "description": "宸叉敹閲戦",
+ "type": "number"
+ },
+ "amountTotal": {
+ "description": "鎬婚",
+ "type": "number"
+ },
"collectionDate": {
"description": "璁″垝鏀舵鏃ユ湡",
"type": "string"
@@ -16294,10 +17054,14 @@
},
"sourceType": {
"description": "婧愬崟绫诲瀷锛�1閿�鍞槑缁�2鏈嶅姟鍚堝悓3閿�鍞彂绁級",
- "type": "integer"
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.CollectionSourceType"
+ }
+ ]
},
"status": {
- "description": "鐘舵�侊紙1鏈敹2宸叉敹锛�",
+ "description": "鐘舵�侊紙1鏈敹2閮ㄥ垎宸叉敹3宸叉敹锛�",
"allOf": [
{
"$ref": "#/definitions/constvar.CollectionStatus"
@@ -16573,7 +17337,7 @@
"satisfaction": {
"type": "integer"
},
- "serviceId": {
+ "serviceOrderId": {
"type": "integer"
},
"solveRate": {
@@ -16611,10 +17375,6 @@
"description": "鑱旂郴浜篿d",
"type": "integer"
},
- "contractId": {
- "description": "鍚堝悓id",
- "type": "integer"
- },
"expectTime": {
"description": "甯屾湜澶勭悊鏃堕棿",
"type": "string"
@@ -16628,10 +17388,6 @@
"type": "integer"
},
"id": {
- "type": "integer"
- },
- "orderId": {
- "description": "閿�鍞鍗昳d",
"type": "integer"
},
"priorityLevelId": {
@@ -16658,6 +17414,14 @@
"description": "閿�鍞満浼歩d",
"type": "integer"
},
+ "salesDetailsId": {
+ "description": "閿�鍞鍗昳d",
+ "type": "integer"
+ },
+ "serviceContractId": {
+ "description": "鍚堝悓id",
+ "type": "integer"
+ },
"serviceManId": {
"description": "鏈嶅姟浜哄憳",
"type": "integer"
@@ -16665,6 +17429,10 @@
"serviceNumber": {
"description": "鏈嶅姟鍗曠紪鍙�",
"type": "string"
+ },
+ "serviceOrderStatusId": {
+ "description": "澶勭悊鐘舵��",
+ "type": "integer"
},
"serviceTypeId": {
"description": "鏈嶅姟鏂瑰紡id",
@@ -16682,10 +17450,6 @@
"description": "鍐呴儴澶囨敞",
"type": "string"
},
- "status": {
- "description": "澶勭悊鐘舵��",
- "type": "integer"
- },
"subject": {
"description": "涓婚",
"type": "string"
@@ -16696,6 +17460,17 @@
}
}
},
+ "request.UpdateServiceOrderStatus": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+ },
"request.UpdateServiceType": {
"type": "object",
"properties": {
--
Gitblit v1.8.0