From 06c0b03df2955475fe39ff2a793a5f151f4da99f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 17 八月 2023 19:25:30 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
docs/docs.go | 85 ++++++++++++++++++++++++++++++++++--------
1 files changed, 68 insertions(+), 17 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 3cc0e8f..b27e16a 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -7075,7 +7075,7 @@
"application/json"
],
"tags": [
- "SalesRefund"
+ "閿�鍞��娆惧崟"
],
"summary": "娣诲姞閿�鍞��娆�",
"parameters": [
@@ -7099,13 +7099,43 @@
}
}
},
+ "/api/salesRefund/delete": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "閿�鍞��娆惧崟"
+ ],
+ "summary": "鎵归噺鍒犻櫎閿�鍞��娆惧崟",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.CommonIds"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
"/api/salesRefund/delete/{id}": {
"delete": {
"produces": [
"application/json"
],
"tags": [
- "SalesRefund"
+ "閿�鍞��娆惧崟"
],
"summary": "鍒犻櫎閿�鍞��娆�",
"parameters": [
@@ -7133,7 +7163,7 @@
"application/json"
],
"tags": [
- "SalesRefund"
+ "閿�鍞��娆惧崟"
],
"summary": "閿�鍞��娆惧崟鍒楄〃",
"parameters": [
@@ -7175,7 +7205,7 @@
"application/json"
],
"tags": [
- "SalesRefund"
+ "閿�鍞��娆惧崟"
],
"summary": "鏇存柊閿�鍞��娆�",
"parameters": [
@@ -12743,12 +12773,13 @@
"description": "闂鎻忚堪",
"type": "string"
},
- "product": {
- "$ref": "#/definitions/model.Product"
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
},
- "productId": {
- "description": "浜у搧id",
- "type": "integer"
+ "productTypeName": {
+ "description": "浜у搧鍒嗙被鍚嶇О",
+ "type": "string"
},
"realTime": {
"description": "瀹為檯澶勭悊鏃堕棿",
@@ -12778,6 +12809,14 @@
"serviceContractId": {
"description": "鏈嶅姟鍚堝悓id",
"type": "integer"
+ },
+ "serviceMan": {
+ "description": "鏈嶅姟浜哄憳",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.User"
+ }
+ ]
},
"serviceManId": {
"description": "鏈嶅姟浜哄憳",
@@ -14443,9 +14482,13 @@
"description": "闂鎻忚堪",
"type": "string"
},
- "productId": {
- "description": "浜у搧id",
- "type": "integer"
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productTypeName": {
+ "description": "浜у搧鍒嗙被鍚嶇О",
+ "type": "string"
},
"realTime": {
"description": "瀹為檯澶勭悊鏃堕棿",
@@ -15061,7 +15104,7 @@
"type": "integer"
},
"search_map": {
- "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"topic\": \"璺熻繘涓婚\", \"member_name\": \"璺熻繘浜篭", \"client_name\": \"瀹㈡埛鍚嶇О\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"follow_time\": \"璺熻繘鏃堕棿\", \"next_follow_time\": \"涓嬫璺熻繘鏃堕棿\", \"record\": \"璺熻繘璁板綍\", \"phone\": \"鑱旂郴浜虹數璇漒", \"contact_name\": \"鑱旂郴浜哄鍚峔"}",
+ "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"topic\": \"璺熻繘涓婚\", \"member_name\": \"璺熻繘浜篭", \"client_name\": \"瀹㈡埛鍚嶇О\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"follow_time\": \"璺熻繘鏃堕棿\", \"next_follow_time\": \"涓嬫璺熻繘鏃堕棿\", \"record\": \"璺熻繘璁板綍\", \"phone\": \"鑱旂郴浜虹數璇漒", \"contact_name\": \"鑱旂郴浜哄鍚峔", \"sales_leads_id\": \"閿�鍞嚎绱d\", \"sale_chance_id\": \"閿�鍞満浼歩d\"}",
"type": "object",
"additionalProperties": true
}
@@ -15552,6 +15595,10 @@
},
"request.SalesRefund": {
"type": "object",
+ "required": [
+ "sourceId",
+ "sourceType"
+ ],
"properties": {
"bankAccountId": {
"description": "璐︽埛id",
@@ -15590,7 +15637,7 @@
"type": "integer"
},
"sourceType": {
- "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
+ "description": "鏉ユ簮绫诲瀷锛�1閿�鍞��娆惧崟锛�",
"allOf": [
{
"$ref": "#/definitions/constvar.RefundSourceType"
@@ -17698,9 +17745,13 @@
"description": "闂鎻忚堪",
"type": "string"
},
- "productId": {
- "description": "浜у搧id",
- "type": "integer"
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productTypeName": {
+ "description": "浜у搧鍒嗙被鍚嶇О",
+ "type": "string"
},
"realTime": {
"description": "瀹為檯澶勭悊鏃堕棿",
--
Gitblit v1.8.0