From 5053e0347804728c63c5498e0aa18129822454cb Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期三, 30 八月 2023 13:31:46 +0800 Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm --- docs/swagger.json | 524 ++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 401 insertions(+), 123 deletions(-) diff --git a/docs/swagger.json b/docs/swagger.json index 87ad4ba..c4d0f38 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -1574,7 +1574,7 @@ } } }, - "/api/contract/delete/{id}": { + "/api/contract/delete": { "delete": { "produces": [ "application/json" @@ -1585,11 +1585,13 @@ "summary": "鍒犻櫎鍚堝悓", "parameters": [ { - "type": "integer", "description": "鏌ヨ鍙傛暟", - "name": "id", - "in": "path", - "required": true + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.DeleteContract" + } } ], "responses": { @@ -3996,7 +3998,7 @@ } } }, - "/api/masterOrder/delete/{id}": { + "/api/masterOrder/delete": { "delete": { "produces": [ "application/json" @@ -4007,11 +4009,13 @@ "summary": "鍒犻櫎涓昏鍗�", "parameters": [ { - "type": "integer", "description": "鏌ヨ鍙傛暟", - "name": "id", - "in": "path", - "required": true + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.DeleteMasterOrder" + } } ], "responses": { @@ -5214,7 +5218,7 @@ } } }, - "/api/quotation/delete/{id}": { + "/api/quotation/delete": { "delete": { "produces": [ "application/json" @@ -5225,11 +5229,13 @@ "summary": "鍒犻櫎鎶ヤ环鍗�", "parameters": [ { - "type": "integer", "description": "鏌ヨ鍙傛暟", - "name": "id", - "in": "path", - "required": true + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.DeleteQuotation" + } } ], "responses": { @@ -5502,22 +5508,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", @@ -5530,14 +5520,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" } ], @@ -6367,7 +6377,7 @@ } } }, - "/api/saleChance/delete/{id}": { + "/api/saleChance/delete": { "delete": { "produces": [ "application/json" @@ -6378,11 +6388,13 @@ "summary": "鍒犻櫎閿�鍞満浼�", "parameters": [ { - "type": "integer", "description": "鏌ヨ鍙傛暟", - "name": "id", - "in": "path", - "required": true + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.DeleteSaleChance" + } } ], "responses": { @@ -6759,7 +6771,19 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/contextx.Response" + "allOf": [ + { + "$ref": "#/definitions/contextx.Response" + }, + { + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/request.AddSalesDetails" + } + } + } + ] } } } @@ -7804,9 +7828,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": { @@ -8002,9 +8044,9 @@ "application/json" ], "tags": [ - "ServiceContractStatus" + "鍚堝悓鐘舵��" ], - "summary": "娣诲姞鏈嶅姟鍚堝悓鐘舵��", + "summary": "娣诲姞鍚堝悓鐘舵��", "parameters": [ { "description": "鏌ヨ鍙傛暟", @@ -8032,9 +8074,9 @@ "application/json" ], "tags": [ - "ServiceContractStatus" + "鍚堝悓鐘舵��" ], - "summary": "鍒犻櫎鏈嶅姟鍚堝悓鐘舵��", + "summary": "鍒犻櫎鍚堝悓鐘舵��", "parameters": [ { "type": "integer", @@ -8060,22 +8102,66 @@ "application/json" ], "tags": [ - "ServiceContractStatus" + "鍚堝悓鐘舵��" ], - "summary": "鑾峰彇鏈嶅姟鍚堝悓鐘舵�佸垪琛�", + "summary": "鑾峰彇鍚堝悓鐘舵�佸垪琛�", + "parameters": [ + { + "type": "string", + "name": "keyword", + "in": "query" + }, + { + "enum": [ + "" + ], + "type": "string", + "x-enum-varnames": [ + "ServiceContractStatusKeywordCustomerName" + ], + "name": "keywordType", + "in": "query" + }, + { + "type": "integer", + "description": "椤电爜", + "name": "page", + "in": "query" + }, + { + "type": "integer", + "description": "姣忛〉澶у皬", + "name": "pageSize", + "in": "query" + }, + { + "enum": [ + "" + ], + "type": "string", + "x-enum-varnames": [ + "ServiceContractStatusQueryClassExpireLessThen60Days" + ], + "name": "queryClass", + "in": "query" + } + ], "responses": { "200": { "description": "OK", "schema": { "allOf": [ { - "$ref": "#/definitions/contextx.Response" + "$ref": "#/definitions/response.ListResponse" }, { "type": "object", "properties": { "data": { - "$ref": "#/definitions/response.ServiceContractStatusResponse" + "type": "array", + "items": { + "$ref": "#/definitions/model.ServiceContractStatus" + } } } } @@ -8091,9 +8177,9 @@ "application/json" ], "tags": [ - "ServiceContractStatus" + "鍚堝悓鐘舵��" ], - "summary": "鏇存柊鏈嶅姟鍚堝悓鐘舵��", + "summary": "鏇存柊鍚堝悓鐘舵��", "parameters": [ { "description": "鏌ヨ鍙傛暟", @@ -8101,7 +8187,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/request.UpdateServiceContractStatuss" + "$ref": "#/definitions/request.UpdateServiceContractStatus" } } ], @@ -9324,7 +9410,7 @@ } } }, - "/api/subOrder/delete/{id}": { + "/api/subOrder/delete": { "delete": { "produces": [ "application/json" @@ -9335,11 +9421,13 @@ "summary": "鍒犻櫎瀛愯鍗�", "parameters": [ { - "type": "integer", "description": "鏌ヨ鍙傛暟", - "name": "id", - "in": "path", - "required": true + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.DeleteSubOrder" + } } ], "responses": { @@ -10313,24 +10401,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": [ @@ -10340,6 +10410,13 @@ 4, 5 ], + "x-enum-comments": { + "ReceiptSourceTypeChuKuDan": "鍑哄簱鍗昳t", + "ReceiptSourceTypeCollectionPlan": "鏀舵璁″垝", + "ReceiptSourceTypeInvoice": "閿�鍞彂绁�", + "ReceiptSourceTypeSalesDetails": "閿�鍞槑缁嗗崟", + "ReceiptSourceTypeServiceContract": "鏈嶅姟鍚堝悓" + }, "x-enum-varnames": [ "ReceiptSourceTypeSalesDetails", "ReceiptSourceTypeServiceContract", @@ -10501,6 +10578,24 @@ "ServiceContractQueryClassExpireAfter60Day", "ServiceContractQueryClassExpiredBefore15Day", "ServiceContractQueryClassExpiredBefore60Day" + ] + }, + "constvar.ServiceContractStatusKeywordType": { + "type": "string", + "enum": [ + "" + ], + "x-enum-varnames": [ + "ServiceContractStatusKeywordCustomerName" + ] + }, + "constvar.ServiceContractStatusQueryClass": { + "type": "string", + "enum": [ + "" + ], + "x-enum-varnames": [ + "ServiceContractStatusQueryClassExpireLessThen60Days" ] }, "constvar.ServiceFeeKeywordType": { @@ -10729,6 +10824,10 @@ "model.Client": { "type": "object", "properties": { + "_": { + "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25", + "type": "string" + }, "business_scope": { "type": "string" }, @@ -10774,6 +10873,13 @@ "country_id": { "type": "integer" }, + "created_at": { + "description": "The date when the item was created\nexample: 2023-08-10 15:48:25", + "type": "string" + }, + "creator_id": { + "type": "integer" + }, "detail_address": { "type": "string" }, @@ -10796,6 +10902,7 @@ } }, "id": { + "description": "The ID of the item\nexample: 1", "type": "integer" }, "industry": { @@ -10851,6 +10958,10 @@ }, "service_member_id": { "type": "integer" + }, + "updated_at": { + "description": "The date when the item was last updated\nexample: 2023-08-10 15:48:25", + "type": "string" } } }, @@ -11129,6 +11240,9 @@ "quotationId": { "type": "integer" }, + "serviceContractStatus": { + "$ref": "#/definitions/model.ServiceContractStatus" + }, "statusId": { "type": "integer" }, @@ -11252,6 +11366,9 @@ }, "contact_id": { "type": "integer" + }, + "contact_information": { + "$ref": "#/definitions/model.ContactInformation" }, "contact_information_id": { "type": "integer" @@ -11739,6 +11856,14 @@ "description": "璐︽埛id", "type": "integer" }, + "client": { + "description": "瀹㈡埛id", + "allOf": [ + { + "$ref": "#/definitions/model.Client" + } + ] + }, "clientId": { "description": "瀹㈡埛id", "type": "integer" @@ -12127,6 +12252,9 @@ "signTime": { "type": "string" }, + "updateTime": { + "type": "string" + }, "wechatOrderStatus": { "$ref": "#/definitions/model.WechatOrderStatus" }, @@ -12160,6 +12288,9 @@ "type": "integer" }, "desc": { + "type": "string" + }, + "detail_address": { "type": "string" }, "followRecord": { @@ -12212,6 +12343,9 @@ "model.SalesRefund": { "type": "object", "properties": { + "Source": { + "$ref": "#/definitions/model.SalesReturn" + }, "amountTotal": { "description": "浠风◣鍚堣", "type": "number" @@ -12280,6 +12414,9 @@ "$ref": "#/definitions/constvar.RefundSourceType" } ] + }, + "updateTime": { + "type": "string" } } }, @@ -12359,6 +12496,9 @@ "$ref": "#/definitions/constvar.SalesReturnSourceType" } ] + }, + "updateTime": { + "type": "string" } } }, @@ -12437,6 +12577,14 @@ "description": "姣斾緥", "type": "number" }, + "principal": { + "description": "鏀舵璐熻矗浜篒D", + "allOf": [ + { + "$ref": "#/definitions/model.User" + } + ] + }, "principalId": { "description": "鏀舵璐熻矗浜篒D", "type": "integer" @@ -12509,6 +12657,12 @@ "contactId": { "type": "integer" }, + "createTime": { + "type": "string" + }, + "creatorName": { + "type": "string" + }, "endTime": { "type": "string" }, @@ -12570,6 +12724,9 @@ "type": "string" }, "terms": { + "type": "string" + }, + "updateTime": { "type": "string" } } @@ -12640,6 +12797,12 @@ "contactId": { "type": "integer" }, + "createTime": { + "type": "string" + }, + "creatorName": { + "type": "string" + }, "file": { "type": "string" }, @@ -12693,6 +12856,9 @@ }, "timelyRateId": { "type": "integer" + }, + "updateTime": { + "type": "string" } } }, @@ -12729,6 +12895,12 @@ "description": "鑱旂郴浜篿d", "type": "integer" }, + "createTime": { + "type": "string" + }, + "creatorName": { + "type": "string" + }, "expectTime": { "description": "甯屾湜澶勭悊鏃堕棿", "type": "string" @@ -12761,12 +12933,13 @@ "description": "闂鎻忚堪", "type": "string" }, - "product": { - "$ref": "#/definitions/model.Product" + "productName": { + "description": "浜у搧鍚嶇О", + "type": "string" }, - "productId": { - "description": "浜у搧id", - "type": "integer" + "productTypeName": { + "description": "浜у搧鍒嗙被鍚嶇О", + "type": "string" }, "realTime": { "description": "瀹為檯澶勭悊鏃堕棿", @@ -12796,6 +12969,14 @@ "serviceContractId": { "description": "鏈嶅姟鍚堝悓id", "type": "integer" + }, + "serviceMan": { + "description": "鏈嶅姟浜哄憳", + "allOf": [ + { + "$ref": "#/definitions/model.User" + } + ] }, "serviceManId": { "description": "鏈嶅姟浜哄憳", @@ -12840,6 +13021,9 @@ "timeSpentId": { "description": "鑺辫垂鏃堕棿", "type": "integer" + }, + "updateTime": { + "type": "string" } } }, @@ -13033,11 +13217,19 @@ "description": "鐗╂枡绫诲瀷", "type": "string" }, + "MaxInventory": { + "description": "鏈�澶у簱瀛�", + "type": "integer" + }, "MinInventory": { "description": "瀹夊叏搴撳瓨", "type": "integer" }, "Name": { + "type": "string" + }, + "Node": { + "description": "澶囨敞", "type": "string" }, "Number": { @@ -13050,6 +13242,14 @@ "SalePrice": { "description": "閿�鍞环鏍�", "type": "number" + }, + "Specs": { + "description": "瑙勬牸", + "type": "string" + }, + "Type": { + "description": "鍨嬪彿", + "type": "string" }, "Unit": { "type": "string" @@ -13762,6 +13962,14 @@ "description": "璐︽埛id", "type": "integer" }, + "client": { + "description": "瀹㈡埛id", + "allOf": [ + { + "$ref": "#/definitions/model.Client" + } + ] + }, "clientId": { "description": "瀹㈡埛id", "type": "integer" @@ -14092,6 +14300,10 @@ "description": "澶囨敞", "type": "string" }, + "detail_address": { + "description": "璇︾粏鍦板潃", + "type": "string" + }, "member_id": { "description": "閿�鍞礋璐d汉ID", "type": "integer" @@ -14218,6 +14430,12 @@ "salesDetailsId": { "type": "integer" }, + "serviceContractStatusId": { + "type": "integer" + }, + "serviceContractTypeId": { + "type": "integer" + }, "serviceTimes": { "type": "integer" }, @@ -14240,10 +14458,10 @@ }, "request.AddServiceContractStatus": { "type": "object", - "required": [ - "name" - ], "properties": { + "id": { + "type": "integer" + }, "name": { "type": "string" } @@ -14461,9 +14679,13 @@ "description": "闂鎻忚堪", "type": "string" }, - "productId": { - "description": "浜у搧id", - "type": "integer" + "productName": { + "description": "浜у搧鍚嶇О", + "type": "string" + }, + "productTypeName": { + "description": "浜у搧鍒嗙被鍚嶇О", + "type": "string" }, "realTime": { "description": "瀹為檯澶勭悊鏃堕棿", @@ -14844,6 +15066,17 @@ } } }, + "request.DeleteContract": { + "type": "object", + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, "request.DeleteCountry": { "type": "object", "properties": { @@ -14864,7 +15097,40 @@ } } }, + "request.DeleteMasterOrder": { + "type": "object", + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, "request.DeleteOrderManage": { + "type": "object", + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, + "request.DeleteQuotation": { + "type": "object", + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, + "request.DeleteSaleChance": { "type": "object", "properties": { "ids": { @@ -14898,6 +15164,17 @@ } }, "request.DeleteServiceFollowup": { + "type": "object", + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, + "request.DeleteSubOrder": { "type": "object", "properties": { "ids": { @@ -15003,7 +15280,7 @@ "type": "integer" }, "search_map": { - "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐d汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\"}", + "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐d汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\",\"representative\": \"娉曞畾浠h〃浜篭", \"registration_time\": \"娉ㄥ唽鏃堕棿\", \"business_scope\": \"缁忚惀鑼冨洿\", \"remark\": \"澶囨敞\", \"not_admin\":\"1:鎴戠殑瀹㈡埛; 2:admin瀹㈡埛\"}", "type": "object", "additionalProperties": true } @@ -15021,7 +15298,7 @@ "type": "integer" }, "search_map": { - "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐d汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\", \"is_first\": \"鏄惁鏄瑕佽仈绯讳汉\"}", + "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐d汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\", \"is_first\": \"鏄惁鏄瑕佽仈绯讳汉\", \"client_id\": \"clientId 鐢ㄤ簬杩斿洖棣栬鑱旂郴浜篭"}", "type": "object", "additionalProperties": true } @@ -16756,6 +17033,14 @@ "description": "璐︽埛id", "type": "integer" }, + "client": { + "description": "瀹㈡埛id", + "allOf": [ + { + "$ref": "#/definitions/model.Client" + } + ] + }, "clientId": { "description": "瀹㈡埛id", "type": "integer" @@ -17183,6 +17468,10 @@ "description": "澶囨敞", "type": "string" }, + "detail_address": { + "description": "璇︾粏鍦板潃", + "type": "string" + }, "id": { "type": "integer" }, @@ -17358,6 +17647,14 @@ "description": "姣斾緥", "type": "number" }, + "principal": { + "description": "鏀舵璐熻矗浜篒D", + "allOf": [ + { + "$ref": "#/definitions/model.User" + } + ] + }, "principalId": { "description": "鏀舵璐熻矗浜篒D", "type": "integer" @@ -17434,6 +17731,12 @@ "salesDetailsId": { "type": "integer" }, + "serviceContractStatusId": { + "type": "integer" + }, + "serviceContractTypeId": { + "type": "integer" + }, "serviceTimes": { "type": "integer" }, @@ -17456,30 +17759,12 @@ }, "request.UpdateServiceContractStatus": { "type": "object", - "required": [ - "id", - "name" - ], "properties": { "id": { "type": "integer" }, "name": { "type": "string" - } - } - }, - "request.UpdateServiceContractStatuss": { - "type": "object", - "required": [ - "service_contract_status" - ], - "properties": { - "service_contract_status": { - "type": "array", - "items": { - "$ref": "#/definitions/request.UpdateServiceContractStatus" - } } } }, @@ -17720,9 +18005,13 @@ "description": "闂鎻忚堪", "type": "string" }, - "productId": { - "description": "浜у搧id", - "type": "integer" + "productName": { + "description": "浜у搧鍚嶇О", + "type": "string" + }, + "productTypeName": { + "description": "浜у搧鍒嗙被鍚嶇О", + "type": "string" }, "realTime": { "description": "瀹為檯澶勭悊鏃堕棿", @@ -18767,17 +19056,6 @@ "type": "array", "items": { "$ref": "#/definitions/model.Satisfaction" - } - } - } - }, - "response.ServiceContractStatusResponse": { - "type": "object", - "properties": { - "list": { - "type": "array", - "items": { - "$ref": "#/definitions/model.ServiceContractStatus" } } } -- Gitblit v1.8.0