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 | 448 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 368 insertions(+), 80 deletions(-)
diff --git a/docs/swagger.json b/docs/swagger.json
index 2ca9ff1..45cc390 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -9980,18 +9980,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"
]
},
@@ -10132,6 +10150,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": [
@@ -10147,6 +10194,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": {
@@ -10853,32 +10937,6 @@
}
}
},
- "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"
- }
- }
- },
"model.Department": {
"type": "object",
"properties": {
@@ -11412,6 +11470,13 @@
"model.Receipt": {
"type": "object",
"properties": {
+ "amount": {
+ "description": "鏀舵閲戦",
+ "type": "number"
+ },
+ "bankAccount": {
+ "$ref": "#/definitions/model.BankAccount"
+ },
"bankAccountId": {
"description": "璐︽埛id",
"type": "integer"
@@ -11431,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",
@@ -11453,7 +11529,11 @@
},
"sourceType": {
"description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
- "type": "integer"
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.ReceiptSourceType"
+ }
+ ]
}
}
},
@@ -11682,6 +11762,9 @@
"model.SalesDetails": {
"type": "object",
"properties": {
+ "Member": {
+ "$ref": "#/definitions/model.User"
+ },
"address": {
"type": "string"
},
@@ -11700,6 +11783,10 @@
"description": "宸叉敹閲戦",
"type": "number"
},
+ "amountTotal": {
+ "description": "浠风◣鍚堣",
+ "type": "number"
+ },
"amountUnInvoiced": {
"description": "鏈紑绁ㄩ噾棰�",
"type": "number"
@@ -11711,6 +11798,15 @@
"type": "integer"
},
"conditions": {
+ "type": "string"
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "creatorId": {
+ "type": "integer"
+ },
+ "creatorName": {
"type": "string"
},
"deliveryDate": {
@@ -11837,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"
@@ -11849,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",
@@ -11867,16 +11990,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"
@@ -11888,22 +12040,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"
+ }
+ ]
}
}
},
@@ -11947,6 +12115,18 @@
"description": "閲戦",
"type": "number"
},
+ "amountReceivable": {
+ "description": "搴旀敹閲戦",
+ "type": "number"
+ },
+ "amountReceived": {
+ "description": "宸叉敹閲戦",
+ "type": "number"
+ },
+ "amountTotal": {
+ "description": "鎬婚",
+ "type": "number"
+ },
"collectionDate": {
"description": "璁″垝鏀舵鏃ユ湡",
"type": "string"
@@ -11984,10 +12164,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"
@@ -12016,6 +12200,10 @@
},
"amountReceived": {
"description": "宸叉敹閲戦",
+ "type": "number"
+ },
+ "amountTotal": {
+ "description": "浠风◣鍚堣",
"type": "number"
},
"amountUnInvoiced": {
@@ -12162,9 +12350,6 @@
"contactId": {
"type": "integer"
},
- "customerServiceSheet": {
- "$ref": "#/definitions/model.CustomerServiceSheet"
- },
"file": {
"type": "string"
},
@@ -12201,11 +12386,11 @@
"satisfactionId": {
"type": "integer"
},
- "serviceId": {
- "type": "integer"
- },
"serviceOrder": {
"$ref": "#/definitions/model.ServiceOrder"
+ },
+ "serviceOrderId": {
+ "type": "integer"
},
"solveRate": {
"$ref": "#/definitions/model.SolveRate"
@@ -12254,13 +12439,6 @@
"description": "鑱旂郴浜篿d",
"type": "integer"
},
- "contract": {
- "$ref": "#/definitions/model.Contract"
- },
- "contractId": {
- "description": "鍚堝悓id",
- "type": "integer"
- },
"expectTime": {
"description": "甯屾湜澶勭悊鏃堕棿",
"type": "string"
@@ -12281,13 +12459,6 @@
},
"id": {
"type": "integer"
- },
- "orderId": {
- "description": "閿�鍞鍗昳d",
- "type": "integer"
- },
- "orderManage": {
- "$ref": "#/definitions/model.OrderManage"
},
"priorityLevel": {
"$ref": "#/definitions/model.PriorityLevel"
@@ -12320,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": {
@@ -13266,6 +13451,13 @@
"request.AddReceipt": {
"type": "object",
"properties": {
+ "amount": {
+ "description": "鏀舵閲戦",
+ "type": "number"
+ },
+ "bankAccount": {
+ "$ref": "#/definitions/model.BankAccount"
+ },
"bankAccountId": {
"description": "璐︽埛id",
"type": "integer"
@@ -13285,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",
@@ -13307,7 +13510,11 @@
},
"sourceType": {
"description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
- "type": "integer"
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.ReceiptSourceType"
+ }
+ ]
}
}
},
@@ -13892,7 +14099,7 @@
"satisfaction": {
"type": "integer"
},
- "serviceId": {
+ "serviceOrderId": {
"type": "integer"
},
"solveRate": {
@@ -13930,10 +14137,6 @@
"description": "鑱旂郴浜篿d",
"type": "integer"
},
- "contractId": {
- "description": "鍚堝悓id",
- "type": "integer"
- },
"expectTime": {
"description": "甯屾湜澶勭悊鏃堕棿",
"type": "string"
@@ -13944,10 +14147,6 @@
},
"faultTypeId": {
"description": "鏁呴殰绫诲埆id",
- "type": "integer"
- },
- "orderId": {
- "description": "閿�鍞鍗昳d",
"type": "integer"
},
"priorityLevelId": {
@@ -13972,6 +14171,14 @@
},
"saleChanceId": {
"description": "閿�鍞満浼歩d",
+ "type": "integer"
+ },
+ "salesDetailsId": {
+ "description": "閿�鍞鍗昳d",
+ "type": "integer"
+ },
+ "serviceContractId": {
+ "description": "鍚堝悓id",
"type": "integer"
},
"serviceManId": {
@@ -14690,6 +14897,9 @@
"keyword": {
"type": "string"
},
+ "keywordType": {
+ "$ref": "#/definitions/constvar.SalesRefundKeywordType"
+ },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -14776,6 +14986,10 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ },
+ "serviceOrderId": {
+ "description": "鏈嶅姟鍥炶鍗昳d",
+ "type": "integer"
}
}
},
@@ -14798,6 +15012,12 @@
},
"queryClass": {
"$ref": "#/definitions/constvar.ServiceOrderQueryClass"
+ },
+ "salesDetailsId": {
+ "type": "integer"
+ },
+ "serviceContractId": {
+ "type": "integer"
}
}
},
@@ -15029,7 +15249,8 @@
"request.SalesRefund": {
"type": "object",
"properties": {
- "accountId": {
+ "bankAccountId": {
+ "description": "璐︽埛id",
"type": "integer"
},
"clientId": {
@@ -15044,6 +15265,10 @@
"number": {
"type": "string"
},
+ "paymentTypeId": {
+ "description": "鏀舵鏂瑰紡ID",
+ "type": "integer"
+ },
"products": {
"type": "array",
"items": {
@@ -15056,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"
+ }
+ ]
}
}
},
@@ -15074,22 +15308,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"
+ }
+ ]
}
}
},
@@ -16165,6 +16415,13 @@
"request.UpdateReceipt": {
"type": "object",
"properties": {
+ "amount": {
+ "description": "鏀舵閲戦",
+ "type": "number"
+ },
+ "bankAccount": {
+ "$ref": "#/definitions/model.BankAccount"
+ },
"bankAccountId": {
"description": "璐︽埛id",
"type": "integer"
@@ -16184,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",
@@ -16206,7 +16474,11 @@
},
"sourceType": {
"description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
- "type": "integer"
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.ReceiptSourceType"
+ }
+ ]
}
}
},
@@ -16721,6 +16993,18 @@
"description": "閲戦",
"type": "number"
},
+ "amountReceivable": {
+ "description": "搴旀敹閲戦",
+ "type": "number"
+ },
+ "amountReceived": {
+ "description": "宸叉敹閲戦",
+ "type": "number"
+ },
+ "amountTotal": {
+ "description": "鎬婚",
+ "type": "number"
+ },
"collectionDate": {
"description": "璁″垝鏀舵鏃ユ湡",
"type": "string"
@@ -16758,10 +17042,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"
@@ -17037,7 +17325,7 @@
"satisfaction": {
"type": "integer"
},
- "serviceId": {
+ "serviceOrderId": {
"type": "integer"
},
"solveRate": {
@@ -17075,10 +17363,6 @@
"description": "鑱旂郴浜篿d",
"type": "integer"
},
- "contractId": {
- "description": "鍚堝悓id",
- "type": "integer"
- },
"expectTime": {
"description": "甯屾湜澶勭悊鏃堕棿",
"type": "string"
@@ -17092,10 +17376,6 @@
"type": "integer"
},
"id": {
- "type": "integer"
- },
- "orderId": {
- "description": "閿�鍞鍗昳d",
"type": "integer"
},
"priorityLevelId": {
@@ -17122,6 +17402,14 @@
"description": "閿�鍞満浼歩d",
"type": "integer"
},
+ "salesDetailsId": {
+ "description": "閿�鍞鍗昳d",
+ "type": "integer"
+ },
+ "serviceContractId": {
+ "description": "鍚堝悓id",
+ "type": "integer"
+ },
"serviceManId": {
"description": "鏈嶅姟浜哄憳",
"type": "integer"
--
Gitblit v1.8.0