From 012da13206f2e4d6a3871b050c71a3b237878424 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 10 八月 2023 16:39:32 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
docs/docs.go | 457 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 431 insertions(+), 26 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 9a17b79..c23e327 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1242,6 +1242,36 @@
}
}
},
+ "/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/contact/add": {
"post": {
"produces": [
@@ -7620,7 +7650,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.DeleteserviceContract"
+ "$ref": "#/definitions/request.DeleteServiceContract"
}
}
],
@@ -7642,7 +7672,7 @@
"tags": [
"ServiceContract"
],
- "summary": "鐢熸垚璁″垝鍒楄〃",
+ "summary": "鏈嶅姟鍚堝悓鍒楄〃",
"parameters": [
{
"description": "鍙傛暟",
@@ -9483,6 +9513,169 @@
}
}
}
+ },
+ "/api/wechatOrderStatus/add": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "寰俊璁㈠崟鐘舵��"
+ ],
+ "summary": "娣诲姞寰俊璁㈠崟鐘舵��",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddWechatOrderStatus"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api/wechatOrderStatus/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/wechatOrderStatus/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "寰俊璁㈠崟鐘舵��"
+ ],
+ "summary": "鑾峰彇寰俊璁㈠崟鐘舵�佸垪琛�",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "keyword",
+ "in": "query"
+ },
+ {
+ "enum": [
+ ""
+ ],
+ "type": "string",
+ "x-enum-varnames": [
+ "WechatOrderStatusKeywordCustomerName"
+ ],
+ "name": "keywordType",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "enum": [
+ ""
+ ],
+ "type": "string",
+ "x-enum-varnames": [
+ "WechatOrderStatusQueryClassExpireLessThen60Days"
+ ],
+ "name": "queryClass",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/response.ListResponse"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.WechatOrderStatus"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api/wechatOrderStatus/update": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "寰俊璁㈠崟鐘舵��"
+ ],
+ "summary": "鏇存柊寰俊璁㈠崟鐘舵��",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateWechatOrderStatus"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
}
},
"definitions": {
@@ -9656,6 +9849,23 @@
"ReceiptQueryClassExpireLessThen60Days"
]
},
+ "constvar.SalesDetailsKeywordType": {
+ "type": "string",
+ "enum": [
+ "瀹㈡埛鍚嶇О",
+ "璁㈠崟缂栧彿",
+ "绛剧害鏃ユ湡",
+ "閿�鍞礋璐ｄ汉",
+ "浜у搧鍚嶇О"
+ ],
+ "x-enum-varnames": [
+ "SalesDetailsKeywordTypeCustomerName",
+ "SalesDetailsKeywordTypeOrderNumber",
+ "SalesDetailsKeywordTypeSignTime",
+ "SalesDetailsKeywordTypePrincipal",
+ "SalesDetailsKeywordTypeProductName"
+ ]
+ },
"constvar.SalesStatus": {
"type": "integer",
"enum": [
@@ -9801,6 +10011,24 @@
"UserTypeSuper",
"UserTypePrimary",
"UserTypeSub"
+ ]
+ },
+ "constvar.WechatOrderStatusKeywordType": {
+ "type": "string",
+ "enum": [
+ ""
+ ],
+ "x-enum-varnames": [
+ "WechatOrderStatusKeywordCustomerName"
+ ]
+ },
+ "constvar.WechatOrderStatusQueryClass": {
+ "type": "string",
+ "enum": [
+ ""
+ ],
+ "x-enum-varnames": [
+ "WechatOrderStatusQueryClassExpireLessThen60Days"
]
},
"contextx.Response": {
@@ -10457,6 +10685,12 @@
"description": "閿�鍞礋璐ｄ汉id",
"type": "integer"
},
+ "products": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.Product"
+ }
+ },
"sourceId": {
"description": "婧愬崟id",
"type": "integer"
@@ -10706,7 +10940,7 @@
"type": "object",
"properties": {
"amount": {
- "type": "integer"
+ "type": "number"
},
"desc": {
"type": "string"
@@ -11073,6 +11307,22 @@
"addressee": {
"type": "string"
},
+ "amountInvoiced": {
+ "description": "宸插紑绁ㄩ噾棰�",
+ "type": "number"
+ },
+ "amountReceivable": {
+ "description": "搴旀敹閲戦",
+ "type": "number"
+ },
+ "amountReceived": {
+ "description": "宸叉敹閲戦",
+ "type": "number"
+ },
+ "amountUnInvoiced": {
+ "description": "鏈紑绁ㄩ噾棰�",
+ "type": "number"
+ },
"client": {
"$ref": "#/definitions/model.Client"
},
@@ -11115,6 +11365,9 @@
"remark": {
"type": "string"
},
+ "saleChance": {
+ "$ref": "#/definitions/model.SaleChance"
+ },
"saleChanceId": {
"type": "integer"
},
@@ -11125,6 +11378,9 @@
"type": "string"
},
"wechatOrderStatus": {
+ "$ref": "#/definitions/model.WechatOrderStatus"
+ },
+ "wechatOrderStatusId": {
"type": "integer"
}
}
@@ -11366,6 +11622,9 @@
"model.ServiceContract": {
"type": "object",
"properties": {
+ "SaleChance": {
+ "$ref": "#/definitions/model.SaleChance"
+ },
"amountInvoiced": {
"description": "宸插紑绁ㄩ噾棰�",
"type": "number"
@@ -11378,13 +11637,17 @@
"description": "宸叉敹閲戦",
"type": "number"
},
+ "amountUnInvoiced": {
+ "description": "鏈紑绁ㄩ噾棰�",
+ "type": "number"
+ },
+ "client": {
+ "$ref": "#/definitions/model.Client"
+ },
"clientId": {
"type": "integer"
},
"contactId": {
- "type": "integer"
- },
- "contractId": {
"type": "integer"
},
"endTime": {
@@ -11405,6 +11668,9 @@
"$ref": "#/definitions/model.Product"
}
},
+ "quotation": {
+ "$ref": "#/definitions/model.Quotation"
+ },
"quotationId": {
"type": "integer"
},
@@ -11414,8 +11680,20 @@
"saleChanceId": {
"type": "integer"
},
+ "salesDetails": {
+ "$ref": "#/definitions/model.SalesDetails"
+ },
+ "salesDetailsId": {
+ "type": "integer"
+ },
+ "serviceContractStatus": {
+ "$ref": "#/definitions/model.ServiceContractStatus"
+ },
"serviceContractStatusId": {
"type": "integer"
+ },
+ "serviceContractType": {
+ "$ref": "#/definitions/model.ServiceContractType"
},
"serviceContractTypeId": {
"type": "integer"
@@ -11826,6 +12104,17 @@
}
}
},
+ "model.WechatOrderStatus": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+ },
"product.Product": {
"type": "object",
"properties": {
@@ -12042,6 +12331,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"
}
}
},
@@ -12296,6 +12602,13 @@
"principalId": {
"description": "閿�鍞礋璐ｄ汉id",
"type": "integer"
+ },
+ "products": {
+ "description": "鍙戠エ瀵瑰簲浜у搧锛屼粠鐩稿簲婧愬崟閲岃幏鍙�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.Product"
+ }
},
"sourceId": {
"description": "婧愬崟id",
@@ -12763,8 +13076,59 @@
"request.AddSalesDetails": {
"type": "object",
"properties": {
- "salesDetails": {
- "$ref": "#/definitions/request.SalesDetails"
+ "address": {
+ "type": "string"
+ },
+ "addressee": {
+ "type": "string"
+ },
+ "clientId": {
+ "type": "integer"
+ },
+ "conditions": {
+ "type": "string"
+ },
+ "deliveryDate": {
+ "type": "string"
+ },
+ "logisticCompany": {
+ "type": "string"
+ },
+ "logisticCost": {
+ "type": "number"
+ },
+ "logisticNumber": {
+ "type": "string"
+ },
+ "memberId": {
+ "type": "integer"
+ },
+ "number": {
+ "type": "string"
+ },
+ "phone": {
+ "type": "string"
+ },
+ "products": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.Product"
+ }
+ },
+ "remark": {
+ "type": "string"
+ },
+ "saleChanceId": {
+ "type": "integer"
+ },
+ "saleType": {
+ "type": "integer"
+ },
+ "signTime": {
+ "type": "string"
+ },
+ "wechatOrderStatusId": {
+ "type": "integer"
}
}
},
@@ -12882,14 +13246,14 @@
},
"request.AddServiceContract": {
"type": "object",
+ "required": [
+ "memberId"
+ ],
"properties": {
"clientId": {
"type": "integer"
},
"contactId": {
- "type": "integer"
- },
- "contractId": {
"type": "integer"
},
"endTime": {
@@ -12914,6 +13278,9 @@
"type": "string"
},
"saleChanceId": {
+ "type": "integer"
+ },
+ "salesDetailsId": {
"type": "integer"
},
"serviceTimes": {
@@ -13333,6 +13700,17 @@
}
}
},
+ "request.AddWechatOrderStatus": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+ },
"request.Assign": {
"type": "object",
"properties": {
@@ -13536,6 +13914,17 @@
}
}
},
+ "request.DeleteServiceContract": {
+ "type": "object",
+ "properties": {
+ "ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ }
+ }
+ },
"request.DeleteServiceFeeManage": {
"type": "object",
"properties": {
@@ -13564,17 +13953,6 @@
"userId": {
"description": "鐢ㄦ埛ID",
"type": "string"
- }
- }
- },
- "request.DeleteserviceContract": {
- "type": "object",
- "properties": {
- "ids": {
- "type": "array",
- "items": {
- "type": "integer"
- }
}
}
},
@@ -13829,6 +14207,9 @@
"properties": {
"keyword": {
"type": "string"
+ },
+ "keywordType": {
+ "$ref": "#/definitions/constvar.SalesDetailsKeywordType"
},
"page": {
"description": "椤电爜",
@@ -14158,7 +14539,7 @@
"signTime": {
"type": "string"
},
- "wechatOrderStatus": {
+ "wechatOrderStatusId": {
"type": "integer"
}
}
@@ -14892,6 +15273,9 @@
},
"request.UpdateInvoice": {
"type": "object",
+ "required": [
+ "id"
+ ],
"properties": {
"clientId": {
"description": "瀹㈡埛id",
@@ -14927,6 +15311,13 @@
"principalId": {
"description": "閿�鍞礋璐ｄ汉id",
"type": "integer"
+ },
+ "products": {
+ "description": "鍙戠エ瀵瑰簲浜у搧锛屼粠鐩稿簲婧愬崟閲岃幏鍙�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.Product"
+ }
},
"sourceId": {
"description": "婧愬崟id",
@@ -15881,14 +16272,14 @@
},
"request.UpdateServiceContract": {
"type": "object",
+ "required": [
+ "memberId"
+ ],
"properties": {
"clientId": {
"type": "integer"
},
"contactId": {
- "type": "integer"
- },
- "contractId": {
"type": "integer"
},
"endTime": {
@@ -15916,6 +16307,9 @@
"type": "string"
},
"saleChanceId": {
+ "type": "integer"
+ },
+ "salesDetailsId": {
"type": "integer"
},
"serviceTimes": {
@@ -16423,6 +16817,17 @@
}
}
},
+ "request.UpdateWechatOrderStatus": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+ },
"response.AccountIdResponse": {
"type": "object",
"properties": {
--
Gitblit v1.8.0