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 | 912 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 746 insertions(+), 166 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index fb21e1c..a2e23cf 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -11,16 +11,30 @@ type: string x-enum-varnames: - BankAccountQueryClassExpireLessThen60Days - constvar.CollectionStatus: + constvar.CollectionSourceType: enum: - 1 - 2 type: integer x-enum-comments: + CollectionSourceTypeSaleDetails: 閿�鍞槑缁� + CollectionSourceTypeServiceContract: 鏈嶅姟鍚堝悓 + x-enum-varnames: + - CollectionSourceTypeSaleDetails + - CollectionSourceTypeServiceContract + constvar.CollectionStatus: + enum: + - 1 + - 2 + - 3 + type: integer + x-enum-comments: CollectionStatusCollected: 宸叉敹娆� + CollectionStatusSubCollected: 閮ㄥ垎鏀舵 CollectionStatusUnCollected: 寰呮敹娆� x-enum-varnames: - CollectionStatusUnCollected + - CollectionStatusSubCollected - CollectionStatusCollected constvar.CourierCompanyKeywordType: enum: @@ -114,6 +128,28 @@ type: string x-enum-varnames: - ReceiptQueryClassExpireLessThen60Days + constvar.ReceiptSourceType: + enum: + - 1 + - 2 + - 3 + - 4 + - 5 + type: integer + x-enum-varnames: + - ReceiptSourceTypeSalesDetails + - ReceiptSourceTypeServiceContract + - ReceiptSourceTypeInvoice + - ReceiptSourceTypeCollectionPlan + - ReceiptSourceTypeChuKuDan + constvar.RefundSourceType: + enum: + - 1 + type: integer + x-enum-comments: + RefundSourceTypeSalesReturn: 閿�鍞��璐� + x-enum-varnames: + - RefundSourceTypeSalesReturn constvar.SalesDetailsKeywordType: enum: - 瀹㈡埛鍚嶇О @@ -128,6 +164,56 @@ - SalesDetailsKeywordTypeSignTime - SalesDetailsKeywordTypePrincipal - SalesDetailsKeywordTypeProductName + constvar.SalesRefundKeywordType: + enum: + - 閿�鍞��璐у崟缂栧彿 + - 瀹㈡埛鍚嶇О + - 閫�娆炬棩鏈� + - 璐︽埛 + - 鏄惁寮�绁� + - 浠樻鏂瑰紡 + - 閿�鍞礋璐d汉 + - 淇敼鏃堕棿 + - 浠风◣鍚堣 + type: string + x-enum-varnames: + - SalesRefundKeywordRefundNumber + - SalesRefundKeywordClientName + - SalesRefundKeywordRefundDate + - SalesRefundKeywordAccount + - SalesRefundKeywordIsInvoice + - SalesRefundKeywordPaymentType + - SalesRefundKeywordPrincipal + - SalesRefundKeywordUpdateAt + - SalesRefundKeywordPriceTotal + constvar.SalesReturnKeywordType: + enum: + - 閿�鍞��璐у崟缂栧彿 + - 瀹㈡埛鍚嶇О + - 閫�娆炬棩鏈� + - 鐘舵�� + - 閫�鍏ヤ粨搴� + - 搴旈��娆� + - 宸查��娆� + - 閿�鍞礋璐d汉 + type: string + x-enum-varnames: + - SalesReturnKeywordReturnNumber + - SalesReturnKeywordClientName + - SalesReturnKeywordReturnDate + - SalesReturnKeywordStatus + - SalesReturnKeywordRepository + - SalesReturnKeywordAmountShouldRefund + - SalesReturnKeywordAmountHasRefund + - SalesReturnKeywordPrincipal + constvar.SalesReturnSourceType: + enum: + - 1 + type: integer + x-enum-comments: + SalesReturnSourceTypeSaleDetails: 閿�鍞槑缁� + x-enum-varnames: + - SalesReturnSourceTypeSaleDetails constvar.SalesStatus: enum: - 0 @@ -184,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: - 瀹㈡埛鍚嶇О @@ -353,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: @@ -383,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: @@ -398,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' @@ -435,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: @@ -466,6 +584,11 @@ type: object model.CollectionProjection: properties: + _: + description: |- + The date when the item was deleted + example: 2023-08-10 15:48:25 + type: string created_at: description: |- The date when the item was created @@ -473,11 +596,6 @@ type: string creator: type: integer - deleted_at: - description: |- - The date when the item was deleted - example: 2023-08-10 15:48:25 - type: string estimated_collection_amount: type: number estimated_collection_date: @@ -519,6 +637,8 @@ type: integer is_first: type: boolean + member: + $ref: '#/definitions/model.User' member_id: type: integer name: @@ -568,6 +688,8 @@ type: integer is_first: type: boolean + member: + $ref: '#/definitions/model.User' member_id: type: integer name: @@ -589,14 +711,38 @@ wechat: type: string type: object + model.ContactInformation: + properties: + id: + type: integer + name: + type: string + type: object model.Contract: properties: + _: + description: |- + The date when the item was deleted + example: 2023-08-10 15:48:25 + type: string + client: + $ref: '#/definitions/model.Client' clientId: type: integer + created_at: + description: |- + The date when the item was created + example: 2023-08-10 15:48:25 + type: string file: type: string id: + description: |- + The ID of the item + example: 1 type: integer + member: + $ref: '#/definitions/model.User' memberId: type: integer number: @@ -605,8 +751,15 @@ $ref: '#/definitions/model.Quotation' quotationId: type: integer + serviceContractStatus: + $ref: '#/definitions/model.ServiceContractStatus' statusId: 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.Country: properties: @@ -632,23 +785,6 @@ type: integer name: type: string - type: object - model.CustomerServiceSheet: - properties: - handleStatus: - type: integer - id: - type: integer - memberId: - type: integer - number: - type: string - priority: - type: integer - serviceFollowupId: - type: integer - serviceMode: - type: integer type: object model.Department: properties: @@ -691,12 +827,16 @@ $ref: '#/definitions/model.Client' client_id: type: integer + client_status: + $ref: '#/definitions/model.ClientStatus' client_status_id: type: integer contact: $ref: '#/definitions/model.Contact' contact_id: type: integer + contact_information: + $ref: '#/definitions/model.ContactInformation' contact_information_id: type: integer content: @@ -717,8 +857,12 @@ type: string record: type: string + sale_chance: + $ref: '#/definitions/model.SaleChance' sale_chance_id: type: integer + sales_leads: + $ref: '#/definitions/model.SalesLeads' sales_leads_id: type: integer topic: @@ -823,6 +967,8 @@ type: string id: type: integer + member: + $ref: '#/definitions/model.User' member_id: type: integer money: @@ -974,6 +1120,8 @@ type: string id: type: integer + member: + $ref: '#/definitions/model.User' member_id: type: integer number: @@ -982,6 +1130,8 @@ items: $ref: '#/definitions/model.Product' type: array + quotation_status: + $ref: '#/definitions/model.QuotationStatus' quotation_status_id: type: integer sale_chance: @@ -1000,9 +1150,18 @@ type: object model.Receipt: properties: + amount: + description: 鏀舵閲戦 + type: number + bankAccount: + $ref: '#/definitions/model.BankAccount' bankAccountId: description: 璐︽埛id type: integer + client: + allOf: + - $ref: '#/definitions/model.Client' + description: 瀹㈡埛id clientId: description: 瀹㈡埛id type: integer @@ -1014,9 +1173,15 @@ moneyType: description: 甯佺 type: string + paymentType: + $ref: '#/definitions/model.PaymentType' paymentTypeId: description: 鏀舵鏂瑰紡ID type: integer + principal: + allOf: + - $ref: '#/definitions/model.User' + description: 璐熻矗浜篿d principalId: description: 璐熻矗浜篿d type: integer @@ -1030,8 +1195,9 @@ description: 婧愬崟id type: integer sourceType: + allOf: + - $ref: '#/definitions/constvar.ReceiptSourceType' description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級 - type: integer type: object model.RefundMethod: properties: @@ -1119,6 +1285,8 @@ type: string key_maker: type: string + member: + $ref: '#/definitions/model.User' member_id: type: integer name: @@ -1131,6 +1299,8 @@ type: string possibilities_id: type: integer + possibility: + $ref: '#/definitions/model.Possibility' process: type: string projected_amount: @@ -1143,18 +1313,24 @@ $ref: '#/definitions/model.Region' region_id: type: integer + regular_customers: + $ref: '#/definitions/model.RegularCustomers' regular_customers_id: type: integer remark: type: string + sale_stage: + $ref: '#/definitions/model.SaleStage' sale_stage_id: type: integer + sale_type: + $ref: '#/definitions/model.SaleType' sale_type_id: type: integer + sales_sources: + $ref: '#/definitions/model.SalesSources' sales_sources_id: type: integer - salesSources: - $ref: '#/definitions/model.SalesSources' solutions: type: string status_id: @@ -1180,6 +1356,8 @@ type: object model.SalesDetails: properties: + Member: + $ref: '#/definitions/model.User' address: type: string addressee: @@ -1193,6 +1371,9 @@ amountReceived: description: 宸叉敹閲戦 type: number + amountTotal: + description: 浠风◣鍚堣 + type: number amountUnInvoiced: description: 鏈紑绁ㄩ噾棰� type: number @@ -1201,6 +1382,12 @@ clientId: type: integer conditions: + type: string + createTime: + type: string + creatorId: + type: integer + creatorName: type: string deliveryDate: type: string @@ -1232,6 +1419,8 @@ type: integer signTime: type: string + updateTime: + type: string wechatOrderStatus: $ref: '#/definitions/model.WechatOrderStatus' wechatOrderStatusId: @@ -1261,6 +1450,8 @@ type: array id: type: integer + member: + $ref: '#/definitions/model.User' member_id: type: integer name: @@ -1277,6 +1468,8 @@ $ref: '#/definitions/model.Region' region_id: type: integer + sales_sources: + $ref: '#/definitions/model.SalesSources' sales_sources_id: type: integer sales_status: @@ -1284,18 +1477,37 @@ type: object model.SalesRefund: properties: - accountId: + amountTotal: + description: 浠风◣鍚堣 + type: number + bankAccount: + $ref: '#/definitions/model.BankAccount' + bankAccountId: + description: 璐︽埛id type: integer + client: + $ref: '#/definitions/model.Client' clientId: type: integer + createTime: + type: string + creatorName: + type: string id: type: integer isInvoice: - type: integer + type: string + member: + $ref: '#/definitions/model.User' memberId: type: integer number: type: string + paymentType: + $ref: '#/definitions/model.PaymentType' + paymentTypeId: + description: 鏀舵鏂瑰紡ID + type: integer products: items: $ref: '#/definitions/model.Product' @@ -1304,13 +1516,38 @@ type: string refundDate: type: string - refundMethod: + sourceId: + description: 婧愬崟id + type: integer + sourceType: + allOf: + - $ref: '#/definitions/constvar.RefundSourceType' + description: 鏉ユ簮绫诲瀷锛�1閿�鍞��璐э級 + updateTime: type: string type: object model.SalesReturn: properties: + Member: + $ref: '#/definitions/model.User' + SalesReturnStatus: + allOf: + - $ref: '#/definitions/model.SalesReturnStatus' + description: 閫�璐х姸鎬� + amountHasRefund: + description: 宸查��娆鹃噾棰� + type: number + amountShouldRefund: + description: 搴旈��娆鹃噾棰� + type: number + client: + $ref: '#/definitions/model.Client' clientId: type: integer + createTime: + type: string + creatorName: + type: string id: type: integer memberId: @@ -1318,17 +1555,30 @@ number: type: string products: + description: 閫�璐т骇鍝� items: $ref: '#/definitions/model.Product' type: array reason: + description: 閫�璐у師鍥� type: string repository: type: string returnDate: + description: 閫�璐ф棩鏈� type: string - salesReturnStatus: + salesReturnStatusId: + description: 閫�璐х姸鎬乮d type: integer + sourceId: + description: 婧愬崟id + type: integer + sourceType: + allOf: + - $ref: '#/definitions/constvar.SalesReturnSourceType' + description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級 + updateTime: + type: string type: object model.SalesReturnStatus: properties: @@ -1355,6 +1605,15 @@ properties: amount: description: 閲戦 + type: number + amountReceivable: + description: 搴旀敹閲戦 + type: number + amountReceived: + description: 宸叉敹閲戦 + type: number + amountTotal: + description: 鎬婚 type: number collectionDate: description: 璁″垝鏀舵鏃ユ湡 @@ -1383,12 +1642,13 @@ description: 婧愬崟id type: integer sourceType: + allOf: + - $ref: '#/definitions/constvar.CollectionSourceType' description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁�2鏈嶅姟鍚堝悓3閿�鍞彂绁級 - type: integer status: allOf: - $ref: '#/definitions/constvar.CollectionStatus' - description: 鐘舵�侊紙1鏈敹2宸叉敹锛� + description: 鐘舵�侊紙1鏈敹2閮ㄥ垎宸叉敹3宸叉敹锛� term: description: 鏈熸 type: integer @@ -1406,6 +1666,9 @@ amountReceived: description: 宸叉敹閲戦 type: number + amountTotal: + description: 浠风◣鍚堣 + type: number amountUnInvoiced: description: 鏈紑绁ㄩ噾棰� type: number @@ -1417,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: @@ -1456,6 +1725,8 @@ startTime: type: string terms: + type: string + updateTime: type: string type: object model.ServiceContractStatus: @@ -1501,8 +1772,10 @@ $ref: '#/definitions/model.Contact' contactId: type: integer - customerServiceSheet: - $ref: '#/definitions/model.CustomerServiceSheet' + createTime: + type: string + creatorName: + type: string file: type: string id: @@ -1527,10 +1800,10 @@ $ref: '#/definitions/model.Satisfaction' satisfactionId: type: integer - serviceId: - type: integer serviceOrder: $ref: '#/definitions/model.ServiceOrder' + serviceOrderId: + type: integer solveRate: $ref: '#/definitions/model.SolveRate' solveRateId: @@ -1539,6 +1812,8 @@ $ref: '#/definitions/model.TimelyRate' timelyRateId: type: integer + updateTime: + type: string type: object model.ServiceOrder: properties: @@ -1566,11 +1841,10 @@ contactId: description: 鑱旂郴浜篿d type: integer - contract: - $ref: '#/definitions/model.Contract' - contractId: - description: 鍚堝悓id - type: integer + createTime: + type: string + creatorName: + type: string expectTime: description: 甯屾湜澶勭悊鏃堕棿 type: string @@ -1586,11 +1860,6 @@ type: integer id: type: integer - orderId: - description: 閿�鍞鍗昳d - type: integer - orderManage: - $ref: '#/definitions/model.OrderManage' priorityLevel: $ref: '#/definitions/model.PriorityLevel' priorityLevelId: @@ -1599,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 @@ -1615,6 +1885,20 @@ saleChanceId: description: 閿�鍞満浼歩d type: integer + salesDetails: + $ref: '#/definitions/model.SalesDetails' + salesDetailsId: + description: 閿�鍞槑缁唅d + type: integer + serviceContract: + $ref: '#/definitions/model.ServiceContract' + serviceContractId: + description: 鏈嶅姟鍚堝悓id + type: integer + serviceMan: + allOf: + - $ref: '#/definitions/model.User' + description: 鏈嶅姟浜哄憳 serviceManId: description: 鏈嶅姟浜哄憳 type: integer @@ -1623,6 +1907,9 @@ type: string serviceOrderStatus: $ref: '#/definitions/model.ServiceOrderStatus' + serviceOrderStatusId: + description: 澶勭悊鐘舵�� + type: integer serviceType: $ref: '#/definitions/model.ServiceType' serviceTypeId: @@ -1636,9 +1923,6 @@ solutionRemark: description: 鍐呴儴澶囨敞 type: string - status: - description: 澶勭悊鐘舵�� - type: integer subject: description: 涓婚 type: string @@ -1647,6 +1931,8 @@ timeSpentId: description: 鑺辫垂鏃堕棿 type: integer + updateTime: + type: string type: object model.ServiceOrderStatus: properties: @@ -1691,8 +1977,12 @@ type: integer id: type: integer + masterOrder: + $ref: '#/definitions/model.MasterOrder' masterOrderId: type: integer + member: + $ref: '#/definitions/model.User' memberId: type: integer number: @@ -1837,6 +2127,9 @@ type: integer contact: $ref: '#/definitions/request.Contact' + contact_id: + description: 鑱旂郴浜篒D + type: integer country_id: type: integer detail_address: @@ -2250,9 +2543,18 @@ type: object request.AddReceipt: properties: + amount: + description: 鏀舵閲戦 + type: number + bankAccount: + $ref: '#/definitions/model.BankAccount' bankAccountId: description: 璐︽埛id type: integer + client: + allOf: + - $ref: '#/definitions/model.Client' + description: 瀹㈡埛id clientId: description: 瀹㈡埛id type: integer @@ -2264,9 +2566,15 @@ moneyType: description: 甯佺 type: string + paymentType: + $ref: '#/definitions/model.PaymentType' paymentTypeId: description: 鏀舵鏂瑰紡ID type: integer + principal: + allOf: + - $ref: '#/definitions/model.User' + description: 璐熻矗浜篿d principalId: description: 璐熻矗浜篿d type: integer @@ -2280,8 +2588,9 @@ description: 婧愬崟id type: integer sourceType: + allOf: + - $ref: '#/definitions/constvar.ReceiptSourceType' description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級 - type: integer type: object request.AddRefundMethod: properties: @@ -2562,10 +2871,10 @@ type: object request.AddServiceContractStatus: properties: + id: + type: integer name: type: string - required: - - name type: object request.AddServiceContractType: properties: @@ -2595,6 +2904,9 @@ type: integer contact: $ref: '#/definitions/request.Contact' + contact_id: + description: 鑱旂郴浜篒D + type: integer country_id: type: integer detail_address: @@ -2673,7 +2985,7 @@ type: string satisfaction: type: integer - serviceId: + serviceOrderId: type: integer solveRate: type: integer @@ -2700,9 +3012,6 @@ contactId: description: 鑱旂郴浜篿d type: integer - contractId: - description: 鍚堝悓id - type: integer expectTime: description: 甯屾湜澶勭悊鏃堕棿 type: string @@ -2712,18 +3021,18 @@ faultTypeId: description: 鏁呴殰绫诲埆id type: integer - orderId: - description: 閿�鍞鍗昳d - type: integer priorityLevelId: description: 浼樺厛绾у埆id type: integer problemDesc: description: 闂鎻忚堪 type: string - productId: - description: 浜у搧id - type: integer + productName: + description: 浜у搧鍚嶇О + type: string + productTypeName: + description: 浜у搧鍒嗙被鍚嶇О + type: string realTime: description: 瀹為檯澶勭悊鏃堕棿 type: string @@ -2733,12 +3042,21 @@ saleChanceId: description: 閿�鍞満浼歩d type: integer + salesDetailsId: + description: 閿�鍞鍗昳d + type: integer + serviceContractId: + description: 鍚堝悓id + type: integer serviceManId: description: 鏈嶅姟浜哄憳 type: integer serviceNumber: description: 鏈嶅姟鍗曠紪鍙� type: string + serviceOrderStatusId: + description: 澶勭悊鐘舵�� + type: integer serviceTypeId: description: 鏈嶅姟鏂瑰紡id type: integer @@ -2751,9 +3069,6 @@ solutionRemark: description: 鍐呴儴澶囨敞 type: string - status: - description: 澶勭悊鐘舵�� - type: integer subject: description: 涓婚 type: string @@ -2903,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: @@ -2966,6 +3295,13 @@ type: integer type: array type: object + request.DeleteContract: + properties: + ids: + items: + type: integer + type: array + type: object request.DeleteCountry: properties: id: @@ -2979,6 +3315,13 @@ type: integer type: array type: object + request.DeleteMasterOrder: + properties: + ids: + items: + type: integer + type: array + type: object request.DeleteOrderManage: properties: ids: @@ -2986,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: @@ -3008,6 +3358,13 @@ type: array type: object request.DeleteServiceFollowup: + properties: + ids: + items: + type: integer + type: array + type: object + request.DeleteSubOrder: properties: ids: items: @@ -3098,19 +3455,23 @@ 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: properties: - keyword: - type: string page: description: 椤电爜 type: integer pageSize: description: 姣忛〉澶у皬 type: integer + search_map: + additionalProperties: true + description: '鎼滅储鏉′欢: map[string]interface{} {"member_name": "閿�鍞礋璐d汉", "number": + "鍚堝悓缂栧彿", "created_at": "鍒涘缓鏃堕棿"}' + type: object type: object request.GetFaqList: properties: @@ -3140,19 +3501,23 @@ 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: properties: - keyword: - type: string page: description: 椤电爜 type: integer pageSize: description: 姣忛〉澶у皬 type: integer + search_map: + additionalProperties: true + description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"number": "閿�鍞�诲崟鍙�", + "client_name": "瀹㈡埛鍚嶇О", "member_name": "閿�鍞礋璐d汉", "start_time": "寮�濮嬫椂闂�", "end_time": + "缁撴潫鏃堕棿", "money": "鎬婚噾棰�", "member_name": "璐熻矗浜�"}' + type: object type: object request.GetOrderManageList: properties: @@ -3178,25 +3543,34 @@ type: object request.GetQuotationList: properties: - keyword: - type: string page: description: 椤电爜 type: integer pageSize: description: 姣忛〉澶у皬 type: integer + search_map: + additionalProperties: true + description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"sale_chance_id": + 閿�鍞嚎绱d, "client_name": "瀹㈡埛鍚嶇О", "member_name": "閿�鍞礋璐d汉", "contact_name": "鑱旂郴浜�", + "validity_date": "鏈夋晥鏈�"}' + type: object type: object request.GetSaleChanceList: properties: - keyword: - type: string page: description: 椤电爜 type: integer pageSize: description: 姣忛〉澶у皬 type: integer + search_map: + additionalProperties: true + description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"name": "鏈轰細鍚嶇О", + "client_name": "瀹㈡埛鍚嶇О","number":"缂栧彿", "contact_name":"鑱旂郴浜哄鍚�", "member_name": + "閿�鍞礋璐d汉", "status": "鐘舵��", "sale_stage": "闃舵", "possibilities": "鍙兘鎬�", "expected_time": + "棰勮鎴愪氦鏃堕棿", "budget": "璧勯噾缁濆鍊�", "projected_amount": "棰勮鍚堝悓閲戦"}' + type: object type: object request.GetSalesDetailsList: properties: @@ -3230,6 +3604,8 @@ properties: keyword: type: string + keywordType: + $ref: '#/definitions/constvar.SalesRefundKeywordType' page: description: 椤电爜 type: integer @@ -3241,6 +3617,8 @@ properties: keyword: type: string + keywordType: + $ref: '#/definitions/constvar.SalesReturnKeywordType' page: description: 椤电爜 type: integer @@ -3290,6 +3668,9 @@ pageSize: description: 姣忛〉澶у皬 type: integer + serviceOrderId: + description: 鏈嶅姟鍥炶鍗昳d + type: integer type: object request.GetServiceOrderList: properties: @@ -3305,17 +3686,25 @@ type: integer queryClass: $ref: '#/definitions/constvar.ServiceOrderQueryClass' + salesDetailsId: + type: integer + serviceContractId: + type: integer type: object request.GetSubOrderList: properties: - keyword: - type: string page: description: 椤电爜 type: integer pageSize: description: 姣忛〉澶у皬 type: integer + search_map: + additionalProperties: true + description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"number": "閿�鍞瓙鍗曞彿", + "client_name": "瀹㈡埛鍚嶇О", "master_order_number": "閿�鍞�诲崟鍙�", "member_name": "閿�鍞礋璐d汉", + "master_order_id": "閿�鍞�诲崟id"}' + type: object type: object request.GetUserList: properties: @@ -3458,16 +3847,20 @@ type: object request.SalesRefund: properties: - accountId: + bankAccountId: + description: 璐︽埛id type: integer clientId: type: integer isInvoice: - type: integer + type: string memberId: type: integer number: type: string + paymentTypeId: + description: 鏀舵鏂瑰紡ID + type: integer products: items: $ref: '#/definitions/model.Product' @@ -3476,8 +3869,16 @@ type: string refundDate: type: string - refundMethod: - type: string + sourceId: + description: 婧愬崟id + type: integer + sourceType: + allOf: + - $ref: '#/definitions/constvar.RefundSourceType' + description: 鏉ユ簮绫诲瀷锛�1閿�鍞��娆惧崟锛� + required: + - sourceId + - sourceType type: object request.SalesReturn: properties: @@ -3488,17 +3889,28 @@ number: type: string products: + description: 閫�璐т骇鍝� items: $ref: '#/definitions/model.Product' type: array reason: + description: 閫�璐у師鍥� type: string repository: type: string returnDate: + description: 閫�璐ф棩鏈� type: string - status: + salesReturnStatusId: + description: 閫�璐х姸鎬乮d type: integer + sourceId: + description: 婧愬崟id + type: integer + sourceType: + allOf: + - $ref: '#/definitions/constvar.SalesReturnSourceType' + description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級 type: object request.SetAuthorityMenu: properties: @@ -3606,6 +4018,9 @@ type: integer contact: $ref: '#/definitions/request.Contact' + contact_id: + description: 鑱旂郴浜篒D + type: integer country_id: type: integer detail_address: @@ -4222,9 +4637,18 @@ type: object request.UpdateReceipt: properties: + amount: + description: 鏀舵閲戦 + type: number + bankAccount: + $ref: '#/definitions/model.BankAccount' bankAccountId: description: 璐︽埛id type: integer + client: + allOf: + - $ref: '#/definitions/model.Client' + description: 瀹㈡埛id clientId: description: 瀹㈡埛id type: integer @@ -4236,9 +4660,15 @@ moneyType: description: 甯佺 type: string + paymentType: + $ref: '#/definitions/model.PaymentType' paymentTypeId: description: 鏀舵鏂瑰紡ID type: integer + principal: + allOf: + - $ref: '#/definitions/model.User' + description: 璐熻矗浜篿d principalId: description: 璐熻矗浜篿d type: integer @@ -4252,8 +4682,9 @@ description: 婧愬崟id type: integer sourceType: + allOf: + - $ref: '#/definitions/constvar.ReceiptSourceType' description: 鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級 - type: integer type: object request.UpdateRefundMethod: properties: @@ -4594,6 +5025,15 @@ amount: description: 閲戦 type: number + amountReceivable: + description: 搴旀敹閲戦 + type: number + amountReceived: + description: 宸叉敹閲戦 + type: number + amountTotal: + description: 鎬婚 + type: number collectionDate: description: 璁″垝鏀舵鏃ユ湡 type: string @@ -4621,12 +5061,13 @@ description: 婧愬崟id type: integer sourceType: + allOf: + - $ref: '#/definitions/constvar.CollectionSourceType' description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁�2鏈嶅姟鍚堝悓3閿�鍞彂绁級 - type: integer status: allOf: - $ref: '#/definitions/constvar.CollectionStatus' - description: 鐘舵�侊紙1鏈敹2宸叉敹锛� + description: 鐘舵�侊紙1鏈敹2閮ㄥ垎宸叉敹3宸叉敹锛� term: description: 鏈熸 type: integer @@ -4678,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: @@ -4731,6 +5160,9 @@ type: integer contact: $ref: '#/definitions/request.Contact' + contact_id: + description: 鑱旂郴浜篒D + type: integer country_id: type: integer detail_address: @@ -4811,7 +5243,7 @@ type: string satisfaction: type: integer - serviceId: + serviceOrderId: type: integer solveRate: type: integer @@ -4838,9 +5270,6 @@ contactId: description: 鑱旂郴浜篿d type: integer - contractId: - description: 鍚堝悓id - type: integer expectTime: description: 甯屾湜澶勭悊鏃堕棿 type: string @@ -4852,18 +5281,18 @@ type: integer id: type: integer - orderId: - description: 閿�鍞鍗昳d - type: integer priorityLevelId: description: 浼樺厛绾у埆id type: integer problemDesc: description: 闂鎻忚堪 type: string - productId: - description: 浜у搧id - type: integer + productName: + description: 浜у搧鍚嶇О + type: string + productTypeName: + description: 浜у搧鍒嗙被鍚嶇О + type: string realTime: description: 瀹為檯澶勭悊鏃堕棿 type: string @@ -4873,12 +5302,21 @@ saleChanceId: description: 閿�鍞満浼歩d type: integer + salesDetailsId: + description: 閿�鍞鍗昳d + type: integer + serviceContractId: + description: 鍚堝悓id + type: integer serviceManId: description: 鏈嶅姟浜哄憳 type: integer serviceNumber: description: 鏈嶅姟鍗曠紪鍙� type: string + serviceOrderStatusId: + description: 澶勭悊鐘舵�� + type: integer serviceTypeId: description: 鏈嶅姟鏂瑰紡id type: integer @@ -4891,9 +5329,6 @@ solutionRemark: description: 鍐呴儴澶囨敞 type: string - status: - description: 澶勭悊鐘舵�� - type: integer subject: description: 涓婚 type: string @@ -5069,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: @@ -5547,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: @@ -6013,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: @@ -6527,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: @@ -6546,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: @@ -8039,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: @@ -8784,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: @@ -9496,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: @@ -9741,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: @@ -9920,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: @@ -9938,7 +10451,7 @@ $ref: '#/definitions/contextx.Response' summary: 鍒犻櫎閿�鍞��娆� tags: - - SalesRefund + - 閿�鍞��娆惧崟 /api/salesRefund/list: post: parameters: @@ -9962,7 +10475,7 @@ type: object summary: 閿�鍞��娆惧崟鍒楄〃 tags: - - SalesRefund + - 閿�鍞��娆惧崟 /api/salesRefund/update: put: parameters: @@ -9981,7 +10494,7 @@ $ref: '#/definitions/contextx.Response' summary: 鏇存柊閿�鍞��娆� tags: - - SalesRefund + - 閿�鍞��娆惧崟 /api/salesReturn/add: post: parameters: @@ -10000,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: @@ -10018,7 +10550,7 @@ $ref: '#/definitions/contextx.Response' summary: 鍒犻櫎閿�鍞��璐� tags: - - SalesReturn + - 閿�鍞��璐у崟 /api/salesReturn/list: post: parameters: @@ -10042,7 +10574,7 @@ type: object summary: 閿�鍞��璐у崟鍒楄〃 tags: - - SalesReturn + - 閿�鍞��璐у崟 /api/salesReturn/update: put: parameters: @@ -10061,7 +10593,7 @@ $ref: '#/definitions/contextx.Response' summary: 鏇存柊閿�鍞��璐� tags: - - SalesReturn + - 閿�鍞��璐у崟 /api/salesReturnStatus/add: post: parameters: @@ -10383,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: @@ -10396,7 +10928,7 @@ description: OK schema: $ref: '#/definitions/contextx.Response' - summary: 鍒犻櫎鏈嶅姟鍚堝悓 + summary: 鎵归噺鍒犻櫎鏈嶅姟鍚堝悓 tags: - ServiceContract /api/serviceContract/list: @@ -10458,9 +10990,9 @@ description: OK schema: $ref: '#/definitions/contextx.Response' - summary: 娣诲姞鏈嶅姟鍚堝悓鐘舵�� + summary: 娣诲姞鍚堝悓鐘舵�� tags: - - ServiceContractStatus + - 鍚堝悓鐘舵�� /api/serviceContractStatus/delete/{id}: delete: parameters: @@ -10476,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: @@ -10488,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: @@ -10504,7 +11064,7 @@ name: object required: true schema: - $ref: '#/definitions/request.UpdateServiceContractStatuss' + $ref: '#/definitions/request.UpdateServiceContractStatus' produces: - application/json responses: @@ -10512,9 +11072,9 @@ description: OK schema: $ref: '#/definitions/contextx.Response' - summary: 鏇存柊鏈嶅姟鍚堝悓鐘舵�� + summary: 鏇存柊鍚堝悓鐘舵�� tags: - - ServiceContractStatus + - 鍚堝悓鐘舵�� /api/serviceContractType/add: post: parameters: @@ -10769,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: @@ -11243,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