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.yaml | 113 ++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 81 insertions(+), 32 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 67c7ecf..4d0f444 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -116,18 +116,6 @@ type: string x-enum-varnames: - PaymentTypeQueryClassExpireLessThen60Days - constvar.ReceiptKeywordType: - enum: - - "" - type: string - x-enum-varnames: - - ReceiptKeywordCustomerName - constvar.ReceiptQueryClass: - enum: - - "" - type: string - x-enum-varnames: - - ReceiptQueryClassExpireLessThen60Days constvar.ReceiptSourceType: enum: - 1 @@ -136,6 +124,12 @@ - 4 - 5 type: integer + x-enum-comments: + ReceiptSourceTypeChuKuDan: 鍑哄簱鍗昳t + ReceiptSourceTypeCollectionPlan: 鏀舵璁″垝 + ReceiptSourceTypeInvoice: 閿�鍞彂绁� + ReceiptSourceTypeSalesDetails: 閿�鍞槑缁嗗崟 + ReceiptSourceTypeServiceContract: 鏈嶅姟鍚堝悓 x-enum-varnames: - ReceiptSourceTypeSalesDetails - ReceiptSourceTypeServiceContract @@ -1444,6 +1438,8 @@ type: integer desc: type: string + detail_address: + type: string followRecord: items: $ref: '#/definitions/model.FollowRecord' @@ -1477,6 +1473,8 @@ type: object model.SalesRefund: properties: + Source: + $ref: '#/definitions/model.SalesReturn' amountTotal: description: 浠风◣鍚堣 type: number @@ -1632,6 +1630,10 @@ percent: description: 姣斾緥 type: number + principal: + allOf: + - $ref: '#/definitions/model.User' + description: 鏀舵璐熻矗浜篒D principalId: description: 鏀舵璐熻矗浜篒D type: integer @@ -2059,10 +2061,16 @@ MaterialMode: description: 鐗╂枡绫诲瀷 type: string + MaxInventory: + description: 鏈�澶у簱瀛� + type: integer MinInventory: description: 瀹夊叏搴撳瓨 type: integer Name: + type: string + Node: + description: 澶囨敞 type: string Number: type: string @@ -2072,6 +2080,12 @@ SalePrice: description: 閿�鍞环鏍� type: number + Specs: + description: 瑙勬牸 + type: string + Type: + description: 鍨嬪彿 + type: string Unit: type: string type: object @@ -2773,6 +2787,9 @@ desc: description: 澶囨敞 type: string + detail_address: + description: 璇︾粏鍦板潃 + type: string member_id: description: 閿�鍞礋璐d汉ID type: integer @@ -3444,9 +3461,9 @@ additionalProperties: true description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"name": "瀹㈡埛鍚嶇О", "phone": "鎵嬫満鍙风爜", "detail_address":"璇︾粏鍦板潃", "next_visit_time":"涓嬪洖鍥炶鏃ユ湡", "member_name": - "閿�鍞礋璐d汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆","legal_representative": + "閿�鍞礋璐d汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆","representative": "娉曞畾浠h〃浜�", "registration_time": "娉ㄥ唽鏃堕棿", "business_scope": "缁忚惀鑼冨洿", "remark": - "澶囨敞"}' + "澶囨敞", "not_admin":"1:鎴戠殑瀹㈡埛; 2:admin瀹㈡埛"}' type: object type: object request.GetContactList: @@ -4938,6 +4955,9 @@ desc: description: 澶囨敞 type: string + detail_address: + description: 璇︾粏鍦板潃 + type: string id: type: integer member_id: @@ -5057,6 +5077,10 @@ percent: description: 姣斾緥 type: number + principal: + allOf: + - $ref: '#/definitions/model.User' + description: 鏀舵璐熻矗浜篒D principalId: description: 鏀舵璐熻矗浜篒D type: integer @@ -9442,16 +9466,6 @@ /api/receipt/list: get: parameters: - - in: query - name: keyword - type: string - - enum: - - "" - in: query - name: keywordType - type: string - x-enum-varnames: - - ReceiptKeywordCustomerName - description: 椤电爜 in: query name: page @@ -9460,13 +9474,30 @@ in: query name: pageSize type: integer + - in: query + name: sourceId + type: integer - enum: - - "" + - 1 + - 2 + - 3 + - 4 + - 5 in: query - name: queryClass - type: string + name: sourceType + type: integer + x-enum-comments: + ReceiptSourceTypeChuKuDan: 鍑哄簱鍗昳t + ReceiptSourceTypeCollectionPlan: 鏀舵璁″垝 + ReceiptSourceTypeInvoice: 閿�鍞彂绁� + ReceiptSourceTypeSalesDetails: 閿�鍞槑缁嗗崟 + ReceiptSourceTypeServiceContract: 鏈嶅姟鍚堝悓 x-enum-varnames: - - ReceiptQueryClassExpireLessThen60Days + - ReceiptSourceTypeSalesDetails + - ReceiptSourceTypeServiceContract + - ReceiptSourceTypeInvoice + - ReceiptSourceTypeCollectionPlan + - ReceiptSourceTypeChuKuDan produces: - application/json responses: @@ -10222,7 +10253,12 @@ "200": description: OK schema: - $ref: '#/definitions/contextx.Response' + allOf: + - $ref: '#/definitions/contextx.Response' + - properties: + data: + $ref: '#/definitions/request.AddSalesDetails' + type: object summary: 娣诲姞閿�鍞槑缁� tags: - SalesDetails @@ -10863,10 +10899,23 @@ /api/serviceCollectionPlan/list: get: parameters: - - description: 鏈嶅姟鍚堝悓id - in: query - name: serviceContractId + - in: query + name: sourceId + required: true type: integer + - enum: + - 1 + - 2 + in: query + name: sourceType + required: true + type: integer + x-enum-comments: + CollectionSourceTypeSaleDetails: 閿�鍞槑缁� + CollectionSourceTypeServiceContract: 鏈嶅姟鍚堝悓 + x-enum-varnames: + - CollectionSourceTypeSaleDetails + - CollectionSourceTypeServiceContract produces: - application/json responses: -- Gitblit v1.8.0