From 037900f7998925e0c8727338aef3a1b199daa898 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期四, 24 八月 2023 11:23:24 +0800 Subject: [PATCH] Merge branch 'hotfix' --- docs/swagger.yaml | 481 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 398 insertions(+), 83 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 5514aac..a2e23cf 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -186,6 +186,26 @@ - SalesRefundKeywordPrincipal - SalesRefundKeywordUpdateAt - SalesRefundKeywordPriceTotal + constvar.SalesReturnKeywordType: + enum: + - 閿�鍞��璐у崟缂栧彿 + - 瀹㈡埛鍚嶇О + - 閫�娆炬棩鏈� + - 鐘舵�� + - 閫�鍏ヤ粨搴� + - 搴旈��娆� + - 宸查��娆� + - 閿�鍞礋璐d汉 + type: string + x-enum-varnames: + - SalesReturnKeywordReturnNumber + - SalesReturnKeywordClientName + - SalesReturnKeywordReturnDate + - SalesReturnKeywordStatus + - SalesReturnKeywordRepository + - SalesReturnKeywordAmountShouldRefund + - SalesReturnKeywordAmountHasRefund + - SalesReturnKeywordPrincipal constvar.SalesReturnSourceType: enum: - 1 @@ -250,6 +270,18 @@ - ServiceContractQueryClassExpireAfter60Day - ServiceContractQueryClassExpiredBefore15Day - ServiceContractQueryClassExpiredBefore60Day + constvar.ServiceContractStatusKeywordType: + enum: + - "" + type: string + x-enum-varnames: + - ServiceContractStatusKeywordCustomerName + constvar.ServiceContractStatusQueryClass: + enum: + - "" + type: string + x-enum-varnames: + - ServiceContractStatusQueryClassExpireLessThen60Days constvar.ServiceFeeKeywordType: enum: - 瀹㈡埛鍚嶇О @@ -419,6 +451,11 @@ type: object model.Client: properties: + _: + description: |- + The date when the item was deleted + example: 2023-08-10 15:48:25 + type: string business_scope: type: string city: @@ -449,6 +486,13 @@ $ref: '#/definitions/model.Country' country_id: type: integer + created_at: + description: |- + The date when the item was created + example: 2023-08-10 15:48:25 + type: string + creator_id: + type: integer detail_address: type: string enterprise_nature_id: @@ -464,6 +508,9 @@ $ref: '#/definitions/model.FollowRecord' type: array id: + description: |- + The ID of the item + example: 1 type: integer industry: $ref: '#/definitions/model.Industry' @@ -501,6 +548,11 @@ type: string service_member_id: type: integer + updated_at: + description: |- + The date when the item was last updated + example: 2023-08-10 15:48:25 + type: string type: object model.ClientLevel: properties: @@ -659,6 +711,13 @@ wechat: type: string type: object + model.ContactInformation: + properties: + id: + type: integer + name: + type: string + type: object model.Contract: properties: _: @@ -692,6 +751,8 @@ $ref: '#/definitions/model.Quotation' quotationId: type: integer + serviceContractStatus: + $ref: '#/definitions/model.ServiceContractStatus' statusId: type: integer updated_at: @@ -774,6 +835,8 @@ $ref: '#/definitions/model.Contact' contact_id: type: integer + contact_information: + $ref: '#/definitions/model.ContactInformation' contact_information_id: type: integer content: @@ -1095,6 +1158,10 @@ bankAccountId: description: 璐︽埛id type: integer + client: + allOf: + - $ref: '#/definitions/model.Client' + description: 瀹㈡埛id clientId: description: 瀹㈡埛id type: integer @@ -1352,6 +1419,8 @@ type: integer signTime: type: string + updateTime: + type: string wechatOrderStatus: $ref: '#/definitions/model.WechatOrderStatus' wechatOrderStatusId: @@ -1381,6 +1450,8 @@ type: array id: type: integer + member: + $ref: '#/definitions/model.User' member_id: type: integer name: @@ -1397,6 +1468,8 @@ $ref: '#/definitions/model.Region' region_id: type: integer + sales_sources: + $ref: '#/definitions/model.SalesSources' sales_sources_id: type: integer sales_status: @@ -1423,7 +1496,7 @@ id: type: integer isInvoice: - type: integer + type: string member: $ref: '#/definitions/model.User' memberId: @@ -1449,7 +1522,9 @@ sourceType: allOf: - $ref: '#/definitions/constvar.RefundSourceType' - description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級 + description: 鏉ユ簮绫诲瀷锛�1閿�鍞��璐э級 + updateTime: + type: string type: object model.SalesReturn: properties: @@ -1459,6 +1534,12 @@ allOf: - $ref: '#/definitions/model.SalesReturnStatus' description: 閫�璐х姸鎬� + amountHasRefund: + description: 宸查��娆鹃噾棰� + type: number + amountShouldRefund: + description: 搴旈��娆鹃噾棰� + type: number client: $ref: '#/definitions/model.Client' clientId: @@ -1496,6 +1577,8 @@ allOf: - $ref: '#/definitions/constvar.SalesReturnSourceType' description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級 + updateTime: + type: string type: object model.SalesReturnStatus: properties: @@ -1597,10 +1680,16 @@ $ref: '#/definitions/model.Contact' contactId: type: integer + createTime: + type: string + creatorName: + type: string endTime: type: string id: type: integer + member: + $ref: '#/definitions/model.User' memberId: type: integer number: @@ -1636,6 +1725,8 @@ startTime: type: string terms: + type: string + updateTime: type: string type: object model.ServiceContractStatus: @@ -1681,6 +1772,10 @@ $ref: '#/definitions/model.Contact' contactId: type: integer + createTime: + type: string + creatorName: + type: string file: type: string id: @@ -1717,6 +1812,8 @@ $ref: '#/definitions/model.TimelyRate' timelyRateId: type: integer + updateTime: + type: string type: object model.ServiceOrder: properties: @@ -1744,6 +1841,10 @@ contactId: description: 鑱旂郴浜篿d type: integer + createTime: + type: string + creatorName: + type: string expectTime: description: 甯屾湜澶勭悊鏃堕棿 type: string @@ -1767,11 +1868,12 @@ problemDesc: description: 闂鎻忚堪 type: string - product: - $ref: '#/definitions/model.Product' - productId: - description: 浜у搧id - type: integer + productName: + description: 浜у搧鍚嶇О + type: string + productTypeName: + description: 浜у搧鍒嗙被鍚嶇О + type: string realTime: description: 瀹為檯澶勭悊鏃堕棿 type: string @@ -1793,6 +1895,10 @@ serviceContractId: description: 鏈嶅姟鍚堝悓id type: integer + serviceMan: + allOf: + - $ref: '#/definitions/model.User' + description: 鏈嶅姟浜哄憳 serviceManId: description: 鏈嶅姟浜哄憳 type: integer @@ -1825,6 +1931,8 @@ timeSpentId: description: 鑺辫垂鏃堕棿 type: integer + updateTime: + type: string type: object model.ServiceOrderStatus: properties: @@ -2019,6 +2127,9 @@ type: integer contact: $ref: '#/definitions/request.Contact' + contact_id: + description: 鑱旂郴浜篒D + type: integer country_id: type: integer detail_address: @@ -2440,6 +2551,10 @@ bankAccountId: description: 璐︽埛id type: integer + client: + allOf: + - $ref: '#/definitions/model.Client' + description: 瀹㈡埛id clientId: description: 瀹㈡埛id type: integer @@ -2756,10 +2871,10 @@ type: object request.AddServiceContractStatus: properties: + id: + type: integer name: type: string - required: - - name type: object request.AddServiceContractType: properties: @@ -2789,6 +2904,9 @@ type: integer contact: $ref: '#/definitions/request.Contact' + contact_id: + description: 鑱旂郴浜篒D + type: integer country_id: type: integer detail_address: @@ -2909,9 +3027,12 @@ problemDesc: description: 闂鎻忚堪 type: string - productId: - description: 浜у搧id - type: integer + productName: + description: 浜у搧鍚嶇О + type: string + productTypeName: + description: 浜у搧鍒嗙被鍚嶇О + type: string realTime: description: 瀹為檯澶勭悊鏃堕棿 type: string @@ -3097,6 +3218,20 @@ description: 鐢ㄦ埛宀椾綅 type: string type: object + request.CheckClientName: + properties: + name: + type: string + type: object + request.CommonIds: + properties: + ids: + items: + type: integer + type: array + required: + - ids + type: object request.Contact: properties: birthday: @@ -3160,6 +3295,13 @@ type: integer type: array type: object + request.DeleteContract: + properties: + ids: + items: + type: integer + type: array + type: object request.DeleteCountry: properties: id: @@ -3173,6 +3315,13 @@ type: integer type: array type: object + request.DeleteMasterOrder: + properties: + ids: + items: + type: integer + type: array + type: object request.DeleteOrderManage: properties: ids: @@ -3180,14 +3329,21 @@ type: integer type: array type: object - request.DeleteSalesLeads: + request.DeleteQuotation: properties: ids: items: type: integer type: array type: object - request.DeleteServiceContract: + request.DeleteSaleChance: + properties: + ids: + items: + type: integer + type: array + type: object + request.DeleteSalesLeads: properties: ids: items: @@ -3202,6 +3358,13 @@ type: array type: object request.DeleteServiceFollowup: + properties: + ids: + items: + type: integer + type: array + type: object + request.DeleteSubOrder: properties: ids: items: @@ -3292,7 +3455,8 @@ additionalProperties: true description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"name": "瀹㈡埛鍚嶇О", "phone": "鎵嬫満鍙风爜", "detail_address":"璇︾粏鍦板潃", "next_visit_time":"涓嬪洖鍥炶鏃ユ湡", "member_name": - "閿�鍞礋璐d汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆", "is_first": "鏄惁鏄瑕佽仈绯讳汉"}' + "閿�鍞礋璐d汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆", "is_first": "鏄惁鏄瑕佽仈绯讳汉", + "client_id": "clientId 鐢ㄤ簬杩斿洖棣栬鑱旂郴浜�"}' type: object type: object request.GetContractList: @@ -3337,7 +3501,7 @@ description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"topic": "璺熻繘涓婚", "member_name": "璺熻繘浜�", "client_name": "瀹㈡埛鍚嶇О", "client_status": "瀹㈡埛鐘舵��", "follow_time": "璺熻繘鏃堕棿", "next_follow_time": "涓嬫璺熻繘鏃堕棿", "record": "璺熻繘璁板綍", "phone": "鑱旂郴浜虹數璇�", - "contact_name": "鑱旂郴浜哄鍚�"}' + "contact_name": "鑱旂郴浜哄鍚�", "sales_leads_id": "閿�鍞嚎绱d", "sale_chance_id": "閿�鍞満浼歩d"}' type: object type: object request.GetMasterOrderList: @@ -3385,7 +3549,7 @@ pageSize: description: 姣忛〉澶у皬 type: integer - searchMap: + search_map: additionalProperties: true description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"sale_chance_id": 閿�鍞嚎绱d, "client_name": "瀹㈡埛鍚嶇О", "member_name": "閿�鍞礋璐d汉", "contact_name": "鑱旂郴浜�", @@ -3453,6 +3617,8 @@ properties: keyword: type: string + keywordType: + $ref: '#/definitions/constvar.SalesReturnKeywordType' page: description: 椤电爜 type: integer @@ -3687,7 +3853,7 @@ clientId: type: integer isInvoice: - type: integer + type: string memberId: type: integer number: @@ -3709,7 +3875,10 @@ sourceType: allOf: - $ref: '#/definitions/constvar.RefundSourceType' - description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級 + description: 鏉ユ簮绫诲瀷锛�1閿�鍞��娆惧崟锛� + required: + - sourceId + - sourceType type: object request.SalesReturn: properties: @@ -3849,6 +4018,9 @@ type: integer contact: $ref: '#/definitions/request.Contact' + contact_id: + description: 鑱旂郴浜篒D + type: integer country_id: type: integer detail_address: @@ -4473,6 +4645,10 @@ bankAccountId: description: 璐︽埛id type: integer + client: + allOf: + - $ref: '#/definitions/model.Client' + description: 瀹㈡埛id clientId: description: 瀹㈡埛id type: integer @@ -4943,18 +5119,6 @@ type: integer name: type: string - required: - - id - - name - type: object - request.UpdateServiceContractStatuss: - properties: - service_contract_status: - items: - $ref: '#/definitions/request.UpdateServiceContractStatus' - type: array - required: - - service_contract_status type: object request.UpdateServiceContractType: properties: @@ -4996,6 +5160,9 @@ type: integer contact: $ref: '#/definitions/request.Contact' + contact_id: + description: 鑱旂郴浜篒D + type: integer country_id: type: integer detail_address: @@ -5120,9 +5287,12 @@ problemDesc: description: 闂鎻忚堪 type: string - productId: - description: 浜у搧id - type: integer + productName: + description: 浜у搧鍚嶇О + type: string + productTypeName: + description: 浜у搧鍒嗙被鍚嶇О + type: string realTime: description: 瀹為檯澶勭悊鏃堕棿 type: string @@ -5334,6 +5504,13 @@ list: items: $ref: '#/definitions/model.ClientType' + type: array + type: object + response.ContactInformationResponse: + properties: + list: + items: + $ref: '#/definitions/model.ContactInformation' type: array type: object response.ContactResponse: @@ -5812,13 +5989,6 @@ $ref: '#/definitions/model.Satisfaction' type: array type: object - response.ServiceContractStatusResponse: - properties: - list: - items: - $ref: '#/definitions/model.ServiceContractStatus' - type: array - type: object response.ServiceContractTypeResponse: properties: list: @@ -6278,6 +6448,25 @@ schema: $ref: '#/definitions/contextx.Response' summary: 娣诲姞瀹㈡埛 + tags: + - Client + /api/client/checkName: + post: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.CheckClientName' + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: '#/definitions/contextx.Response' + summary: 妫�鏌ュ鎴峰悕绉版槸鍚﹂噸澶� tags: - Client /api/client/delete: @@ -6792,6 +6981,23 @@ summary: 鏇存柊鑱旂郴浜� tags: - Contact + /api/contactInformation/list: + get: + produces: + - application/json + responses: + "200": + description: OK + schema: + allOf: + - $ref: '#/definitions/contextx.Response' + - properties: + data: + $ref: '#/definitions/response.ContactInformationResponse' + type: object + summary: 鑱旂郴鏂瑰紡鍒楄〃 + tags: + - ContactInformation /api/contract/add: post: parameters: @@ -6811,14 +7017,15 @@ summary: 娣诲姞鍚堝悓 tags: - Contract - /api/contract/delete/{id}: + /api/contract/delete: delete: parameters: - description: 鏌ヨ鍙傛暟 - in: path - name: id + in: body + name: object required: true - type: integer + schema: + $ref: '#/definitions/request.DeleteContract' produces: - application/json responses: @@ -8304,14 +8511,15 @@ summary: 娣诲姞涓昏鍗� tags: - MasterOrder - /api/masterOrder/delete/{id}: + /api/masterOrder/delete: delete: parameters: - description: 鏌ヨ鍙傛暟 - in: path - name: id + in: body + name: object required: true - type: integer + schema: + $ref: '#/definitions/request.DeleteMasterOrder' produces: - application/json responses: @@ -9049,14 +9257,15 @@ summary: 娣诲姞鎶ヤ环鍗� tags: - Quotation - /api/quotation/delete/{id}: + /api/quotation/delete: delete: parameters: - description: 鏌ヨ鍙傛暟 - in: path - name: id + in: body + name: object required: true - type: integer + schema: + $ref: '#/definitions/request.DeleteQuotation' produces: - application/json responses: @@ -9761,14 +9970,15 @@ summary: 娣诲姞閿�鍞満浼� tags: - SaleChance - /api/saleChance/delete/{id}: + /api/saleChance/delete: delete: parameters: - description: 鏌ヨ鍙傛暟 - in: path - name: id + in: body + name: object required: true - type: integer + schema: + $ref: '#/definitions/request.DeleteSaleChance' produces: - application/json responses: @@ -10006,6 +10216,25 @@ summary: 娣诲姞閿�鍞槑缁� tags: - SalesDetails + /api/salesDetails/delete: + delete: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.CommonIds' + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: '#/definitions/contextx.Response' + summary: 鎵归噺鍒犻櫎閿�鍞槑缁� + tags: + - SalesDetails 閿�鍞槑缁� /api/salesDetails/delete/{id}: delete: parameters: @@ -10185,7 +10414,26 @@ $ref: '#/definitions/contextx.Response' summary: 娣诲姞閿�鍞��娆� tags: - - SalesRefund + - 閿�鍞��娆惧崟 + /api/salesRefund/delete: + delete: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.CommonIds' + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: '#/definitions/contextx.Response' + summary: 鎵归噺鍒犻櫎閿�鍞��娆惧崟 + tags: + - 閿�鍞��娆惧崟 /api/salesRefund/delete/{id}: delete: parameters: @@ -10203,7 +10451,7 @@ $ref: '#/definitions/contextx.Response' summary: 鍒犻櫎閿�鍞��娆� tags: - - SalesRefund + - 閿�鍞��娆惧崟 /api/salesRefund/list: post: parameters: @@ -10227,7 +10475,7 @@ type: object summary: 閿�鍞��娆惧崟鍒楄〃 tags: - - SalesRefund + - 閿�鍞��娆惧崟 /api/salesRefund/update: put: parameters: @@ -10246,7 +10494,7 @@ $ref: '#/definitions/contextx.Response' summary: 鏇存柊閿�鍞��娆� tags: - - SalesRefund + - 閿�鍞��娆惧崟 /api/salesReturn/add: post: parameters: @@ -10265,7 +10513,26 @@ $ref: '#/definitions/contextx.Response' summary: 娣诲姞閿�鍞��璐� tags: - - SalesReturn + - 閿�鍞��璐у崟 + /api/salesReturn/delete: + delete: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.CommonIds' + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: '#/definitions/contextx.Response' + summary: 鎵归噺鍒犻櫎閿�鍞��璐у崟 + tags: + - 閿�鍞��璐у崟 /api/salesReturn/delete/{id}: delete: parameters: @@ -10283,7 +10550,7 @@ $ref: '#/definitions/contextx.Response' summary: 鍒犻櫎閿�鍞��璐� tags: - - SalesReturn + - 閿�鍞��璐у崟 /api/salesReturn/list: post: parameters: @@ -10307,7 +10574,7 @@ type: object summary: 閿�鍞��璐у崟鍒楄〃 tags: - - SalesReturn + - 閿�鍞��璐у崟 /api/salesReturn/update: put: parameters: @@ -10326,7 +10593,7 @@ $ref: '#/definitions/contextx.Response' summary: 鏇存柊閿�鍞��璐� tags: - - SalesReturn + - 閿�鍞��璐у崟 /api/salesReturnStatus/add: post: parameters: @@ -10648,12 +10915,12 @@ /api/serviceContract/delete: delete: parameters: - - description: 鏌ヨ鍙傛暟 + - description: 鍙傛暟 in: body name: object required: true schema: - $ref: '#/definitions/request.DeleteServiceContract' + $ref: '#/definitions/request.CommonIds' produces: - application/json responses: @@ -10661,7 +10928,7 @@ description: OK schema: $ref: '#/definitions/contextx.Response' - summary: 鍒犻櫎鏈嶅姟鍚堝悓 + summary: 鎵归噺鍒犻櫎鏈嶅姟鍚堝悓 tags: - ServiceContract /api/serviceContract/list: @@ -10723,9 +10990,9 @@ description: OK schema: $ref: '#/definitions/contextx.Response' - summary: 娣诲姞鏈嶅姟鍚堝悓鐘舵�� + summary: 娣诲姞鍚堝悓鐘舵�� tags: - - ServiceContractStatus + - 鍚堝悓鐘舵�� /api/serviceContractStatus/delete/{id}: delete: parameters: @@ -10741,11 +11008,37 @@ description: OK schema: $ref: '#/definitions/contextx.Response' - summary: 鍒犻櫎鏈嶅姟鍚堝悓鐘舵�� + summary: 鍒犻櫎鍚堝悓鐘舵�� tags: - - ServiceContractStatus + - 鍚堝悓鐘舵�� /api/serviceContractStatus/list: get: + parameters: + - in: query + name: keyword + type: string + - enum: + - "" + in: query + name: keywordType + type: string + x-enum-varnames: + - ServiceContractStatusKeywordCustomerName + - description: 椤电爜 + in: query + name: page + type: integer + - description: 姣忛〉澶у皬 + in: query + name: pageSize + type: integer + - enum: + - "" + in: query + name: queryClass + type: string + x-enum-varnames: + - ServiceContractStatusQueryClassExpireLessThen60Days produces: - application/json responses: @@ -10753,14 +11046,16 @@ description: OK schema: allOf: - - $ref: '#/definitions/contextx.Response' + - $ref: '#/definitions/response.ListResponse' - properties: data: - $ref: '#/definitions/response.ServiceContractStatusResponse' + items: + $ref: '#/definitions/model.ServiceContractStatus' + type: array type: object - summary: 鑾峰彇鏈嶅姟鍚堝悓鐘舵�佸垪琛� + summary: 鑾峰彇鍚堝悓鐘舵�佸垪琛� tags: - - ServiceContractStatus + - 鍚堝悓鐘舵�� /api/serviceContractStatus/update: put: parameters: @@ -10769,7 +11064,7 @@ name: object required: true schema: - $ref: '#/definitions/request.UpdateServiceContractStatuss' + $ref: '#/definitions/request.UpdateServiceContractStatus' produces: - application/json responses: @@ -10777,9 +11072,9 @@ description: OK schema: $ref: '#/definitions/contextx.Response' - summary: 鏇存柊鏈嶅姟鍚堝悓鐘舵�� + summary: 鏇存柊鍚堝悓鐘舵�� tags: - - ServiceContractStatus + - 鍚堝悓鐘舵�� /api/serviceContractType/add: post: parameters: @@ -11034,6 +11329,25 @@ summary: 娣诲姞鏈嶅姟鍗� tags: - 鏈嶅姟鍗曠鐞� + /api/serviceOrder/delete: + delete: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.CommonIds' + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: '#/definitions/contextx.Response' + summary: 鎵归噺鍒犻櫎鏈嶅姟鍗� + tags: + - 鏈嶅姟鍗� /api/serviceOrder/delete/{id}: delete: parameters: @@ -11508,14 +11822,15 @@ summary: 娣诲姞瀛愯鍗� tags: - SubOrder - /api/subOrder/delete/{id}: + /api/subOrder/delete: delete: parameters: - description: 鏌ヨ鍙傛暟 - in: path - name: id + in: body + name: object required: true - type: integer + schema: + $ref: '#/definitions/request.DeleteSubOrder' produces: - application/json responses: -- Gitblit v1.8.0