From 1e6f42dffe2309ff5ce70f723b6e2fd9443ca3a3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 30 八月 2023 09:59:42 +0800
Subject: [PATCH] Merge branch 'hotfix'
---
docs/docs.go | 227 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 184 insertions(+), 43 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 942f99c..a47945d 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -5520,22 +5520,6 @@
"summary": "鑾峰彇鏀舵鍗曞垪琛�",
"parameters": [
{
- "type": "string",
- "name": "keyword",
- "in": "query"
- },
- {
- "enum": [
- ""
- ],
- "type": "string",
- "x-enum-varnames": [
- "ReceiptKeywordCustomerName"
- ],
- "name": "keywordType",
- "in": "query"
- },
- {
"type": "integer",
"description": "椤电爜",
"name": "page",
@@ -5548,14 +5532,34 @@
"in": "query"
},
{
+ "type": "integer",
+ "name": "sourceId",
+ "in": "query"
+ },
+ {
"enum": [
- ""
+ 1,
+ 2,
+ 3,
+ 4,
+ 5
],
- "type": "string",
+ "type": "integer",
+ "x-enum-comments": {
+ "ReceiptSourceTypeChuKuDan": "鍑哄簱鍗昳t",
+ "ReceiptSourceTypeCollectionPlan": "鏀舵璁″垝",
+ "ReceiptSourceTypeInvoice": "閿�鍞彂绁�",
+ "ReceiptSourceTypeSalesDetails": "閿�鍞槑缁嗗崟",
+ "ReceiptSourceTypeServiceContract": "鏈嶅姟鍚堝悓"
+ },
"x-enum-varnames": [
- "ReceiptQueryClassExpireLessThen60Days"
+ "ReceiptSourceTypeSalesDetails",
+ "ReceiptSourceTypeServiceContract",
+ "ReceiptSourceTypeInvoice",
+ "ReceiptSourceTypeCollectionPlan",
+ "ReceiptSourceTypeChuKuDan"
],
- "name": "queryClass",
+ "name": "sourceType",
"in": "query"
}
],
@@ -6779,7 +6783,19 @@
"200": {
"description": "OK",
"schema": {
- "$ref": "#/definitions/contextx.Response"
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/request.AddSalesDetails"
+ }
+ }
+ }
+ ]
}
}
}
@@ -7824,9 +7840,27 @@
"parameters": [
{
"type": "integer",
- "description": "鏈嶅姟鍚堝悓id",
- "name": "serviceContractId",
- "in": "query"
+ "name": "sourceId",
+ "in": "query",
+ "required": true
+ },
+ {
+ "enum": [
+ 1,
+ 2
+ ],
+ "type": "integer",
+ "x-enum-comments": {
+ "CollectionSourceTypeSaleDetails": "閿�鍞槑缁�",
+ "CollectionSourceTypeServiceContract": "鏈嶅姟鍚堝悓"
+ },
+ "x-enum-varnames": [
+ "CollectionSourceTypeSaleDetails",
+ "CollectionSourceTypeServiceContract"
+ ],
+ "name": "sourceType",
+ "in": "query",
+ "required": true
}
],
"responses": {
@@ -10379,24 +10413,6 @@
"PaymentTypeQueryClassExpireLessThen60Days"
]
},
- "constvar.ReceiptKeywordType": {
- "type": "string",
- "enum": [
- ""
- ],
- "x-enum-varnames": [
- "ReceiptKeywordCustomerName"
- ]
- },
- "constvar.ReceiptQueryClass": {
- "type": "string",
- "enum": [
- ""
- ],
- "x-enum-varnames": [
- "ReceiptQueryClassExpireLessThen60Days"
- ]
- },
"constvar.ReceiptSourceType": {
"type": "integer",
"enum": [
@@ -10406,6 +10422,13 @@
4,
5
],
+ "x-enum-comments": {
+ "ReceiptSourceTypeChuKuDan": "鍑哄簱鍗昳t",
+ "ReceiptSourceTypeCollectionPlan": "鏀舵璁″垝",
+ "ReceiptSourceTypeInvoice": "閿�鍞彂绁�",
+ "ReceiptSourceTypeSalesDetails": "閿�鍞槑缁嗗崟",
+ "ReceiptSourceTypeServiceContract": "鏈嶅姟鍚堝悓"
+ },
"x-enum-varnames": [
"ReceiptSourceTypeSalesDetails",
"ReceiptSourceTypeServiceContract",
@@ -11845,6 +11868,14 @@
"description": "璐︽埛id",
"type": "integer"
},
+ "client": {
+ "description": "瀹㈡埛id",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.Client"
+ }
+ ]
+ },
"clientId": {
"description": "瀹㈡埛id",
"type": "integer"
@@ -12233,6 +12264,9 @@
"signTime": {
"type": "string"
},
+ "updateTime": {
+ "type": "string"
+ },
"wechatOrderStatus": {
"$ref": "#/definitions/model.WechatOrderStatus"
},
@@ -12266,6 +12300,9 @@
"type": "integer"
},
"desc": {
+ "type": "string"
+ },
+ "detail_address": {
"type": "string"
},
"followRecord": {
@@ -12318,6 +12355,9 @@
"model.SalesRefund": {
"type": "object",
"properties": {
+ "Source": {
+ "$ref": "#/definitions/model.SalesReturn"
+ },
"amountTotal": {
"description": "浠风◣鍚堣",
"type": "number"
@@ -12386,6 +12426,9 @@
"$ref": "#/definitions/constvar.RefundSourceType"
}
]
+ },
+ "updateTime": {
+ "type": "string"
}
}
},
@@ -12465,6 +12508,9 @@
"$ref": "#/definitions/constvar.SalesReturnSourceType"
}
]
+ },
+ "updateTime": {
+ "type": "string"
}
}
},
@@ -12543,6 +12589,14 @@
"description": "姣斾緥",
"type": "number"
},
+ "principal": {
+ "description": "鏀舵璐熻矗浜篒D",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.User"
+ }
+ ]
+ },
"principalId": {
"description": "鏀舵璐熻矗浜篒D",
"type": "integer"
@@ -12615,6 +12669,12 @@
"contactId": {
"type": "integer"
},
+ "createTime": {
+ "type": "string"
+ },
+ "creatorName": {
+ "type": "string"
+ },
"endTime": {
"type": "string"
},
@@ -12676,6 +12736,9 @@
"type": "string"
},
"terms": {
+ "type": "string"
+ },
+ "updateTime": {
"type": "string"
}
}
@@ -12746,6 +12809,12 @@
"contactId": {
"type": "integer"
},
+ "createTime": {
+ "type": "string"
+ },
+ "creatorName": {
+ "type": "string"
+ },
"file": {
"type": "string"
},
@@ -12799,6 +12868,9 @@
},
"timelyRateId": {
"type": "integer"
+ },
+ "updateTime": {
+ "type": "string"
}
}
},
@@ -12834,6 +12906,12 @@
"contactId": {
"description": "鑱旂郴浜篿d",
"type": "integer"
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "creatorName": {
+ "type": "string"
},
"expectTime": {
"description": "甯屾湜澶勭悊鏃堕棿",
@@ -12955,6 +13033,9 @@
"timeSpentId": {
"description": "鑺辫垂鏃堕棿",
"type": "integer"
+ },
+ "updateTime": {
+ "type": "string"
}
}
},
@@ -13148,11 +13229,19 @@
"description": "鐗╂枡绫诲瀷",
"type": "string"
},
+ "MaxInventory": {
+ "description": "鏈�澶у簱瀛�",
+ "type": "integer"
+ },
"MinInventory": {
"description": "瀹夊叏搴撳瓨",
"type": "integer"
},
"Name": {
+ "type": "string"
+ },
+ "Node": {
+ "description": "澶囨敞",
"type": "string"
},
"Number": {
@@ -13165,6 +13254,14 @@
"SalePrice": {
"description": "閿�鍞环鏍�",
"type": "number"
+ },
+ "Specs": {
+ "description": "瑙勬牸",
+ "type": "string"
+ },
+ "Type": {
+ "description": "鍨嬪彿",
+ "type": "string"
},
"Unit": {
"type": "string"
@@ -13877,6 +13974,14 @@
"description": "璐︽埛id",
"type": "integer"
},
+ "client": {
+ "description": "瀹㈡埛id",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.Client"
+ }
+ ]
+ },
"clientId": {
"description": "瀹㈡埛id",
"type": "integer"
@@ -14207,6 +14312,10 @@
"description": "澶囨敞",
"type": "string"
},
+ "detail_address": {
+ "description": "璇︾粏鍦板潃",
+ "type": "string"
+ },
"member_id": {
"description": "閿�鍞礋璐ｄ汉ID",
"type": "integer"
@@ -14331,6 +14440,12 @@
"type": "integer"
},
"salesDetailsId": {
+ "type": "integer"
+ },
+ "serviceContractStatusId": {
+ "type": "integer"
+ },
+ "serviceContractTypeId": {
"type": "integer"
},
"serviceTimes": {
@@ -15177,7 +15292,7 @@
"type": "integer"
},
"search_map": {
- "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\"}",
+ "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\",\"representative\": \"娉曞畾浠ｈ〃浜篭", \"registration_time\": \"娉ㄥ唽鏃堕棿\", \"business_scope\": \"缁忚惀鑼冨洿\", \"remark\": \"澶囨敞\", \"not_admin\":\"1:鎴戠殑瀹㈡埛; 2:admin瀹㈡埛\"}",
"type": "object",
"additionalProperties": true
}
@@ -16930,6 +17045,14 @@
"description": "璐︽埛id",
"type": "integer"
},
+ "client": {
+ "description": "瀹㈡埛id",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.Client"
+ }
+ ]
+ },
"clientId": {
"description": "瀹㈡埛id",
"type": "integer"
@@ -17357,6 +17480,10 @@
"description": "澶囨敞",
"type": "string"
},
+ "detail_address": {
+ "description": "璇︾粏鍦板潃",
+ "type": "string"
+ },
"id": {
"type": "integer"
},
@@ -17532,6 +17659,14 @@
"description": "姣斾緥",
"type": "number"
},
+ "principal": {
+ "description": "鏀舵璐熻矗浜篒D",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.User"
+ }
+ ]
+ },
"principalId": {
"description": "鏀舵璐熻矗浜篒D",
"type": "integer"
@@ -17608,6 +17743,12 @@
"salesDetailsId": {
"type": "integer"
},
+ "serviceContractStatusId": {
+ "type": "integer"
+ },
+ "serviceContractTypeId": {
+ "type": "integer"
+ },
"serviceTimes": {
"type": "integer"
},
--
Gitblit v1.8.0