From a86df1054649f0594e4c77174fd254b8abd800ca Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期二, 15 八月 2023 11:22:10 +0800 Subject: [PATCH] fix --- docs/docs.go | 442 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 411 insertions(+), 31 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index 414e949..78076e2 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -9992,18 +9992,36 @@ "BankAccountQueryClassExpireLessThen60Days" ] }, - "constvar.CollectionStatus": { + "constvar.CollectionSourceType": { "type": "integer", "enum": [ 1, 2 ], "x-enum-comments": { + "CollectionSourceTypeSaleDetails": "閿�鍞槑缁�", + "CollectionSourceTypeServiceContract": "鏈嶅姟鍚堝悓" + }, + "x-enum-varnames": [ + "CollectionSourceTypeSaleDetails", + "CollectionSourceTypeServiceContract" + ] + }, + "constvar.CollectionStatus": { + "type": "integer", + "enum": [ + 1, + 2, + 3 + ], + "x-enum-comments": { "CollectionStatusCollected": "宸叉敹娆�", + "CollectionStatusSubCollected": "閮ㄥ垎鏀舵", "CollectionStatusUnCollected": "寰呮敹娆�" }, "x-enum-varnames": [ "CollectionStatusUnCollected", + "CollectionStatusSubCollected", "CollectionStatusCollected" ] }, @@ -10144,6 +10162,35 @@ "ReceiptQueryClassExpireLessThen60Days" ] }, + "constvar.ReceiptSourceType": { + "type": "integer", + "enum": [ + 1, + 2, + 3, + 4, + 5 + ], + "x-enum-varnames": [ + "ReceiptSourceTypeSalesDetails", + "ReceiptSourceTypeServiceContract", + "ReceiptSourceTypeInvoice", + "ReceiptSourceTypeCollectionPlan", + "ReceiptSourceTypeChuKuDan" + ] + }, + "constvar.RefundSourceType": { + "type": "integer", + "enum": [ + 1 + ], + "x-enum-comments": { + "RefundSourceTypeSalesReturn": "閿�鍞��璐�" + }, + "x-enum-varnames": [ + "RefundSourceTypeSalesReturn" + ] + }, "constvar.SalesDetailsKeywordType": { "type": "string", "enum": [ @@ -10159,6 +10206,43 @@ "SalesDetailsKeywordTypeSignTime", "SalesDetailsKeywordTypePrincipal", "SalesDetailsKeywordTypeProductName" + ] + }, + "constvar.SalesRefundKeywordType": { + "type": "string", + "enum": [ + "閿�鍞��璐у崟缂栧彿", + "瀹㈡埛鍚嶇О", + "閫�娆炬棩鏈�", + "璐︽埛", + "鏄惁寮�绁�", + "浠樻鏂瑰紡", + "閿�鍞礋璐d汉", + "淇敼鏃堕棿", + "浠风◣鍚堣" + ], + "x-enum-varnames": [ + "SalesRefundKeywordRefundNumber", + "SalesRefundKeywordClientName", + "SalesRefundKeywordRefundDate", + "SalesRefundKeywordAccount", + "SalesRefundKeywordIsInvoice", + "SalesRefundKeywordPaymentType", + "SalesRefundKeywordPrincipal", + "SalesRefundKeywordUpdateAt", + "SalesRefundKeywordPriceTotal" + ] + }, + "constvar.SalesReturnSourceType": { + "type": "integer", + "enum": [ + 1 + ], + "x-enum-comments": { + "SalesReturnSourceTypeSaleDetails": "閿�鍞槑缁�" + }, + "x-enum-varnames": [ + "SalesReturnSourceTypeSaleDetails" ] }, "constvar.SalesStatus": { @@ -10625,16 +10709,16 @@ "model.CollectionProjection": { "type": "object", "properties": { + "_": { + "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25", + "type": "string" + }, "created_at": { "description": "The date when the item was created\nexample: 2023-08-10 15:48:25", "type": "string" }, "creator": { "type": "integer" - }, - "deleted_at": { - "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25", - "type": "string" }, "estimated_collection_amount": { "type": "number" @@ -10690,6 +10774,9 @@ }, "is_first": { "type": "boolean" + }, + "member": { + "$ref": "#/definitions/model.User" }, "member_id": { "type": "integer" @@ -10765,6 +10852,9 @@ "is_first": { "type": "boolean" }, + "member": { + "$ref": "#/definitions/model.User" + }, "member_id": { "type": "integer" }, @@ -10800,14 +10890,29 @@ "model.Contract": { "type": "object", "properties": { + "_": { + "description": "The date when the item was deleted\nexample: 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\nexample: 2023-08-10 15:48:25", + "type": "string" }, "file": { "type": "string" }, "id": { + "description": "The ID of the item\nexample: 1", "type": "integer" + }, + "member": { + "$ref": "#/definitions/model.User" }, "memberId": { "type": "integer" @@ -10823,6 +10928,10 @@ }, "statusId": { "type": "integer" + }, + "updated_at": { + "description": "The date when the item was last updated\nexample: 2023-08-10 15:48:25", + "type": "string" } } }, @@ -10929,6 +11038,9 @@ "client_id": { "type": "integer" }, + "client_status": { + "$ref": "#/definitions/model.ClientStatus" + }, "client_status_id": { "type": "integer" }, @@ -10968,8 +11080,14 @@ "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" @@ -11126,6 +11244,9 @@ }, "id": { "type": "integer" + }, + "member": { + "$ref": "#/definitions/model.User" }, "member_id": { "type": "integer" @@ -11358,6 +11479,9 @@ "id": { "type": "integer" }, + "member": { + "$ref": "#/definitions/model.User" + }, "member_id": { "type": "integer" }, @@ -11369,6 +11493,9 @@ "items": { "$ref": "#/definitions/model.Product" } + }, + "quotation_status": { + "$ref": "#/definitions/model.QuotationStatus" }, "quotation_status_id": { "type": "integer" @@ -11398,6 +11525,13 @@ "model.Receipt": { "type": "object", "properties": { + "amount": { + "description": "鏀舵閲戦", + "type": "number" + }, + "bankAccount": { + "$ref": "#/definitions/model.BankAccount" + }, "bankAccountId": { "description": "璐︽埛id", "type": "integer" @@ -11417,9 +11551,20 @@ "description": "甯佺", "type": "string" }, + "paymentType": { + "$ref": "#/definitions/model.PaymentType" + }, "paymentTypeId": { "description": "鏀舵鏂瑰紡ID", "type": "integer" + }, + "principal": { + "description": "璐熻矗浜篿d", + "allOf": [ + { + "$ref": "#/definitions/model.User" + } + ] }, "principalId": { "description": "璐熻矗浜篿d", @@ -11439,7 +11584,11 @@ }, "sourceType": { "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級", - "type": "integer" + "allOf": [ + { + "$ref": "#/definitions/constvar.ReceiptSourceType" + } + ] } } }, @@ -11575,6 +11724,9 @@ "key_maker": { "type": "string" }, + "member": { + "$ref": "#/definitions/model.User" + }, "member_id": { "type": "integer" }, @@ -11592,6 +11744,9 @@ }, "possibilities_id": { "type": "integer" + }, + "possibility": { + "$ref": "#/definitions/model.Possibility" }, "process": { "type": "string" @@ -11611,19 +11766,28 @@ "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" }, - "salesSources": { + "sales_sources": { "$ref": "#/definitions/model.SalesSources" }, "sales_sources_id": { @@ -11668,6 +11832,9 @@ "model.SalesDetails": { "type": "object", "properties": { + "Member": { + "$ref": "#/definitions/model.User" + }, "address": { "type": "string" }, @@ -11686,6 +11853,10 @@ "description": "宸叉敹閲戦", "type": "number" }, + "amountTotal": { + "description": "浠风◣鍚堣", + "type": "number" + }, "amountUnInvoiced": { "description": "鏈紑绁ㄩ噾棰�", "type": "number" @@ -11697,6 +11868,15 @@ "type": "integer" }, "conditions": { + "type": "string" + }, + "createTime": { + "type": "string" + }, + "creatorId": { + "type": "integer" + }, + "creatorName": { "type": "string" }, "deliveryDate": { @@ -11812,6 +11992,9 @@ "region_id": { "type": "integer" }, + "sales_sources": { + "$ref": "#/definitions/model.SalesSources" + }, "sales_sources_id": { "type": "integer" }, @@ -11823,11 +12006,28 @@ "model.SalesRefund": { "type": "object", "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" @@ -11835,11 +12035,21 @@ "isInvoice": { "type": "integer" }, + "member": { + "$ref": "#/definitions/model.User" + }, "memberId": { "type": "integer" }, "number": { "type": "string" + }, + "paymentType": { + "$ref": "#/definitions/model.PaymentType" + }, + "paymentTypeId": { + "description": "鏀舵鏂瑰紡ID", + "type": "integer" }, "products": { "type": "array", @@ -11853,16 +12063,45 @@ "refundDate": { "type": "string" }, - "refundMethod": { - "type": "string" + "sourceId": { + "description": "婧愬崟id", + "type": "integer" + }, + "sourceType": { + "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級", + "allOf": [ + { + "$ref": "#/definitions/constvar.RefundSourceType" + } + ] } } }, "model.SalesReturn": { "type": "object", "properties": { + "Member": { + "$ref": "#/definitions/model.User" + }, + "SalesReturnStatus": { + "description": "閫�璐х姸鎬�", + "allOf": [ + { + "$ref": "#/definitions/model.SalesReturnStatus" + } + ] + }, + "client": { + "$ref": "#/definitions/model.Client" + }, "clientId": { "type": "integer" + }, + "createTime": { + "type": "string" + }, + "creatorName": { + "type": "string" }, "id": { "type": "integer" @@ -11874,22 +12113,38 @@ "type": "string" }, "products": { + "description": "閫�璐т骇鍝�", "type": "array", "items": { "$ref": "#/definitions/model.Product" } }, "reason": { + "description": "閫�璐у師鍥�", "type": "string" }, "repository": { "type": "string" }, "returnDate": { + "description": "閫�璐ф棩鏈�", "type": "string" }, - "salesReturnStatus": { + "salesReturnStatusId": { + "description": "閫�璐х姸鎬乮d", "type": "integer" + }, + "sourceId": { + "description": "婧愬崟id", + "type": "integer" + }, + "sourceType": { + "description": "婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級", + "allOf": [ + { + "$ref": "#/definitions/constvar.SalesReturnSourceType" + } + ] } } }, @@ -11933,6 +12188,18 @@ "description": "閲戦", "type": "number" }, + "amountReceivable": { + "description": "搴旀敹閲戦", + "type": "number" + }, + "amountReceived": { + "description": "宸叉敹閲戦", + "type": "number" + }, + "amountTotal": { + "description": "鎬婚", + "type": "number" + }, "collectionDate": { "description": "璁″垝鏀舵鏃ユ湡", "type": "string" @@ -11970,10 +12237,14 @@ }, "sourceType": { "description": "婧愬崟绫诲瀷锛�1閿�鍞槑缁�2鏈嶅姟鍚堝悓3閿�鍞彂绁級", - "type": "integer" + "allOf": [ + { + "$ref": "#/definitions/constvar.CollectionSourceType" + } + ] }, "status": { - "description": "鐘舵�侊紙1鏈敹2宸叉敹锛�", + "description": "鐘舵�侊紙1鏈敹2閮ㄥ垎宸叉敹3宸叉敹锛�", "allOf": [ { "$ref": "#/definitions/constvar.CollectionStatus" @@ -12002,6 +12273,10 @@ }, "amountReceived": { "description": "宸叉敹閲戦", + "type": "number" + }, + "amountTotal": { + "description": "浠风◣鍚堣", "type": "number" }, "amountUnInvoiced": { @@ -12418,8 +12693,14 @@ "id": { "type": "integer" }, + "masterOrder": { + "$ref": "#/definitions/model.MasterOrder" + }, "masterOrderId": { "type": "integer" + }, + "member": { + "$ref": "#/definitions/model.User" }, "memberId": { "type": "integer" @@ -13249,6 +13530,13 @@ "request.AddReceipt": { "type": "object", "properties": { + "amount": { + "description": "鏀舵閲戦", + "type": "number" + }, + "bankAccount": { + "$ref": "#/definitions/model.BankAccount" + }, "bankAccountId": { "description": "璐︽埛id", "type": "integer" @@ -13268,9 +13556,20 @@ "description": "甯佺", "type": "string" }, + "paymentType": { + "$ref": "#/definitions/model.PaymentType" + }, "paymentTypeId": { "description": "鏀舵鏂瑰紡ID", "type": "integer" + }, + "principal": { + "description": "璐熻矗浜篿d", + "allOf": [ + { + "$ref": "#/definitions/model.User" + } + ] }, "principalId": { "description": "璐熻矗浜篿d", @@ -13290,7 +13589,11 @@ }, "sourceType": { "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級", - "type": "integer" + "allOf": [ + { + "$ref": "#/definitions/constvar.ReceiptSourceType" + } + ] } } }, @@ -14491,9 +14794,6 @@ "request.GetContractList": { "type": "object", "properties": { - "keyword": { - "type": "string" - }, "page": { "description": "椤电爜", "type": "integer" @@ -14501,6 +14801,11 @@ "pageSize": { "description": "姣忛〉澶у皬", "type": "integer" + }, + "search_map": { + "description": "鎼滅储鏉′欢: map[string]interface{} {\"member_name\": \"閿�鍞礋璐d汉\", \"number\": \"鍚堝悓缂栧彿\", \"created_at\": \"鍒涘缓鏃堕棿\"}", + "type": "object", + "additionalProperties": true } } }, @@ -14547,9 +14852,6 @@ "request.GetMasterOrderList": { "type": "object", "properties": { - "keyword": { - "type": "string" - }, "page": { "description": "椤电爜", "type": "integer" @@ -14557,6 +14859,11 @@ "pageSize": { "description": "姣忛〉澶у皬", "type": "integer" + }, + "search_map": { + "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"number\": \"閿�鍞�诲崟鍙穃", \"client_name\": \"瀹㈡埛鍚嶇О\", \"member_name\": \"閿�鍞礋璐d汉\", \"start_time\": \"寮�濮嬫椂闂碶", \"end_time\": \"缁撴潫鏃堕棿\", \"money\": \"鎬婚噾棰漒", \"member_name\": \"璐熻矗浜篭"}", + "type": "object", + "additionalProperties": true } } }, @@ -14604,7 +14911,7 @@ "type": "integer" }, "searchMap": { - "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 閿�鍞嚎绱d}", + "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 閿�鍞嚎绱d, \"client_name\": \"瀹㈡埛鍚嶇О\", \"member_name\": \"閿�鍞礋璐d汉\", \"contact_name\": \"鑱旂郴浜篭", \"validity_date\": \"鏈夋晥鏈焅"}", "type": "object", "additionalProperties": true } @@ -14670,6 +14977,9 @@ "properties": { "keyword": { "type": "string" + }, + "keywordType": { + "$ref": "#/definitions/constvar.SalesRefundKeywordType" }, "page": { "description": "椤电爜", @@ -14795,9 +15105,6 @@ "request.GetSubOrderList": { "type": "object", "properties": { - "keyword": { - "type": "string" - }, "page": { "description": "椤电爜", "type": "integer" @@ -14805,6 +15112,11 @@ "pageSize": { "description": "姣忛〉澶у皬", "type": "integer" + }, + "search_map": { + "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"number\": \"閿�鍞瓙鍗曞彿\", \"client_name\": \"瀹㈡埛鍚嶇О\", \"master_order_number\": \"閿�鍞�诲崟鍙穃", \"member_name\": \"閿�鍞礋璐d汉\", \"master_order_id\": \"閿�鍞�诲崟id\"}", + "type": "object", + "additionalProperties": true } } }, @@ -15020,7 +15332,8 @@ "request.SalesRefund": { "type": "object", "properties": { - "accountId": { + "bankAccountId": { + "description": "璐︽埛id", "type": "integer" }, "clientId": { @@ -15035,6 +15348,10 @@ "number": { "type": "string" }, + "paymentTypeId": { + "description": "鏀舵鏂瑰紡ID", + "type": "integer" + }, "products": { "type": "array", "items": { @@ -15047,8 +15364,17 @@ "refundDate": { "type": "string" }, - "refundMethod": { - "type": "string" + "sourceId": { + "description": "婧愬崟id", + "type": "integer" + }, + "sourceType": { + "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級", + "allOf": [ + { + "$ref": "#/definitions/constvar.RefundSourceType" + } + ] } } }, @@ -15065,22 +15391,38 @@ "type": "string" }, "products": { + "description": "閫�璐т骇鍝�", "type": "array", "items": { "$ref": "#/definitions/model.Product" } }, "reason": { + "description": "閫�璐у師鍥�", "type": "string" }, "repository": { "type": "string" }, "returnDate": { + "description": "閫�璐ф棩鏈�", "type": "string" }, - "status": { + "salesReturnStatusId": { + "description": "閫�璐х姸鎬乮d", "type": "integer" + }, + "sourceId": { + "description": "婧愬崟id", + "type": "integer" + }, + "sourceType": { + "description": "婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級", + "allOf": [ + { + "$ref": "#/definitions/constvar.SalesReturnSourceType" + } + ] } } }, @@ -16156,6 +16498,13 @@ "request.UpdateReceipt": { "type": "object", "properties": { + "amount": { + "description": "鏀舵閲戦", + "type": "number" + }, + "bankAccount": { + "$ref": "#/definitions/model.BankAccount" + }, "bankAccountId": { "description": "璐︽埛id", "type": "integer" @@ -16175,9 +16524,20 @@ "description": "甯佺", "type": "string" }, + "paymentType": { + "$ref": "#/definitions/model.PaymentType" + }, "paymentTypeId": { "description": "鏀舵鏂瑰紡ID", "type": "integer" + }, + "principal": { + "description": "璐熻矗浜篿d", + "allOf": [ + { + "$ref": "#/definitions/model.User" + } + ] }, "principalId": { "description": "璐熻矗浜篿d", @@ -16197,7 +16557,11 @@ }, "sourceType": { "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級", - "type": "integer" + "allOf": [ + { + "$ref": "#/definitions/constvar.ReceiptSourceType" + } + ] } } }, @@ -16712,6 +17076,18 @@ "description": "閲戦", "type": "number" }, + "amountReceivable": { + "description": "搴旀敹閲戦", + "type": "number" + }, + "amountReceived": { + "description": "宸叉敹閲戦", + "type": "number" + }, + "amountTotal": { + "description": "鎬婚", + "type": "number" + }, "collectionDate": { "description": "璁″垝鏀舵鏃ユ湡", "type": "string" @@ -16749,10 +17125,14 @@ }, "sourceType": { "description": "婧愬崟绫诲瀷锛�1閿�鍞槑缁�2鏈嶅姟鍚堝悓3閿�鍞彂绁級", - "type": "integer" + "allOf": [ + { + "$ref": "#/definitions/constvar.CollectionSourceType" + } + ] }, "status": { - "description": "鐘舵�侊紙1鏈敹2宸叉敹锛�", + "description": "鐘舵�侊紙1鏈敹2閮ㄥ垎宸叉敹3宸叉敹锛�", "allOf": [ { "$ref": "#/definitions/constvar.CollectionStatus" -- Gitblit v1.8.0