From 5e15dc38b6ded37d6645e15aa187c370ffa23352 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期日, 13 八月 2023 15:53:37 +0800 Subject: [PATCH] 完善退款单查询 --- docs/docs.go | 571 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 549 insertions(+), 22 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index ab95e71..e22c0b6 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -8341,6 +8341,169 @@ } } }, + "/api/serviceOrderStatus/add": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "鏈嶅姟鍗曠姸鎬�" + ], + "summary": "娣诲姞鏈嶅姟鍗曠姸鎬�", + "parameters": [ + { + "description": "鏌ヨ鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.AddServiceOrderStatus" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/contextx.Response" + } + } + } + } + }, + "/api/serviceOrderStatus/delete/{id}": { + "delete": { + "produces": [ + "application/json" + ], + "tags": [ + "鏈嶅姟鍗曠姸鎬�" + ], + "summary": "鍒犻櫎鏈嶅姟鍗曠姸鎬�", + "parameters": [ + { + "type": "integer", + "description": "鏌ヨ鍙傛暟", + "name": "id", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/contextx.Response" + } + } + } + } + }, + "/api/serviceOrderStatus/list": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "鏈嶅姟鍗曠姸鎬�" + ], + "summary": "鑾峰彇鏈嶅姟鍗曠姸鎬佸垪琛�", + "parameters": [ + { + "type": "string", + "name": "keyword", + "in": "query" + }, + { + "enum": [ + "" + ], + "type": "string", + "x-enum-varnames": [ + "ServiceOrderStatusKeywordCustomerName" + ], + "name": "keywordType", + "in": "query" + }, + { + "type": "integer", + "description": "椤电爜", + "name": "page", + "in": "query" + }, + { + "type": "integer", + "description": "姣忛〉澶у皬", + "name": "pageSize", + "in": "query" + }, + { + "enum": [ + "" + ], + "type": "string", + "x-enum-varnames": [ + "ServiceOrderStatusQueryClassExpireLessThen60Days" + ], + "name": "queryClass", + "in": "query" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.ListResponse" + }, + { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/model.ServiceOrderStatus" + } + } + } + } + ] + } + } + } + } + }, + "/api/serviceOrderStatus/update": { + "put": { + "produces": [ + "application/json" + ], + "tags": [ + "鏈嶅姟鍗曠姸鎬�" + ], + "summary": "鏇存柊鏈嶅姟鍗曠姸鎬�", + "parameters": [ + { + "description": "鏌ヨ鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.UpdateServiceOrderStatus" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/contextx.Response" + } + } + } + } + }, "/api/serviceType/add": { "post": { "produces": [ @@ -9678,18 +9841,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" ] }, @@ -9830,6 +10011,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": [ @@ -9845,6 +10055,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": { @@ -10006,6 +10253,24 @@ ], "x-enum-varnames": [ "ServiceOrderQueryClassExpireLessThen60Days" + ] + }, + "constvar.ServiceOrderStatusKeywordType": { + "type": "string", + "enum": [ + "" + ], + "x-enum-varnames": [ + "ServiceOrderStatusKeywordCustomerName" + ] + }, + "constvar.ServiceOrderStatusQueryClass": { + "type": "string", + "enum": [ + "" + ], + "x-enum-varnames": [ + "ServiceOrderStatusQueryClassExpireLessThen60Days" ] }, "constvar.UserType": { @@ -11050,6 +11315,13 @@ "model.Receipt": { "type": "object", "properties": { + "amount": { + "description": "鏀舵閲戦", + "type": "number" + }, + "bankAccount": { + "$ref": "#/definitions/model.BankAccount" + }, "bankAccountId": { "description": "璐︽埛id", "type": "integer" @@ -11069,9 +11341,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", @@ -11091,7 +11374,11 @@ }, "sourceType": { "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級", - "type": "integer" + "allOf": [ + { + "$ref": "#/definitions/constvar.ReceiptSourceType" + } + ] } } }, @@ -11314,6 +11601,9 @@ "model.SalesDetails": { "type": "object", "properties": { + "Member": { + "$ref": "#/definitions/model.User" + }, "address": { "type": "string" }, @@ -11332,6 +11622,10 @@ "description": "宸叉敹閲戦", "type": "number" }, + "amountTotal": { + "description": "浠风◣鍚堣", + "type": "number" + }, "amountUnInvoiced": { "description": "鏈紑绁ㄩ噾棰�", "type": "number" @@ -11343,6 +11637,15 @@ "type": "integer" }, "conditions": { + "type": "string" + }, + "createTime": { + "type": "string" + }, + "creatorId": { + "type": "integer" + }, + "creatorName": { "type": "string" }, "deliveryDate": { @@ -11469,11 +11772,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" @@ -11481,11 +11801,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", @@ -11499,16 +11829,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" @@ -11520,22 +11879,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" + } + ] } } }, @@ -11579,6 +11954,18 @@ "description": "閲戦", "type": "number" }, + "amountReceivable": { + "description": "搴旀敹閲戦", + "type": "number" + }, + "amountReceived": { + "description": "宸叉敹閲戦", + "type": "number" + }, + "amountTotal": { + "description": "鎬婚", + "type": "number" + }, "collectionDate": { "description": "璁″垝鏀舵鏃ユ湡", "type": "string" @@ -11616,10 +12003,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" @@ -11650,6 +12041,10 @@ "description": "宸叉敹閲戦", "type": "number" }, + "amountTotal": { + "description": "浠风◣鍚堣", + "type": "number" + }, "amountUnInvoiced": { "description": "鏈紑绁ㄩ噾棰�", "type": "number" @@ -11659,6 +12054,9 @@ }, "clientId": { "type": "integer" + }, + "contact": { + "$ref": "#/definitions/model.Contact" }, "contactId": { "type": "integer" @@ -11862,11 +12260,11 @@ "type": "string" }, "carFare": { - "description": "浜ら�氳垂", + "description": "浜ら�氳垂 // 浜ら�氳垂", "type": "number" }, "chargeAmount": { - "description": "鏀惰垂閲戦", + "description": "鏀惰垂閲戦 // 鏀惰垂閲戦", "type": "number" }, "client": { @@ -11959,6 +12357,13 @@ "description": "鏈嶅姟鍗曠紪鍙�", "type": "string" }, + "serviceOrderStatus": { + "$ref": "#/definitions/model.ServiceOrderStatus" + }, + "serviceOrderStatusId": { + "description": "澶勭悊鐘舵��", + "type": "integer" + }, "serviceType": { "$ref": "#/definitions/model.ServiceType" }, @@ -11977,10 +12382,6 @@ "description": "鍐呴儴澶囨敞", "type": "string" }, - "status": { - "description": "澶勭悊鐘舵��", - "type": "integer" - }, "subject": { "description": "涓婚", "type": "string" @@ -11991,6 +12392,17 @@ "timeSpentId": { "description": "鑺辫垂鏃堕棿", "type": "integer" + } + } + }, + "model.ServiceOrderStatus": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "name": { + "type": "string" } } }, @@ -12858,6 +13270,13 @@ "request.AddReceipt": { "type": "object", "properties": { + "amount": { + "description": "鏀舵閲戦", + "type": "number" + }, + "bankAccount": { + "$ref": "#/definitions/model.BankAccount" + }, "bankAccountId": { "description": "璐︽埛id", "type": "integer" @@ -12877,9 +13296,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", @@ -12899,7 +13329,11 @@ }, "sourceType": { "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級", - "type": "integer" + "allOf": [ + { + "$ref": "#/definitions/constvar.ReceiptSourceType" + } + ] } } }, @@ -13604,6 +14038,17 @@ } } }, + "request.AddServiceOrderStatus": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "name": { + "type": "string" + } + } + }, "request.AddServiceType": { "type": "object", "properties": { @@ -14265,6 +14710,9 @@ "keyword": { "type": "string" }, + "keywordType": { + "$ref": "#/definitions/constvar.SalesRefundKeywordType" + }, "page": { "description": "椤电爜", "type": "integer" @@ -14589,7 +15037,8 @@ "request.SalesRefund": { "type": "object", "properties": { - "accountId": { + "bankAccountId": { + "description": "璐︽埛id", "type": "integer" }, "clientId": { @@ -14604,6 +15053,10 @@ "number": { "type": "string" }, + "paymentTypeId": { + "description": "鏀舵鏂瑰紡ID", + "type": "integer" + }, "products": { "type": "array", "items": { @@ -14616,8 +15069,17 @@ "refundDate": { "type": "string" }, - "refundMethod": { - "type": "string" + "sourceId": { + "description": "婧愬崟id", + "type": "integer" + }, + "sourceType": { + "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級", + "allOf": [ + { + "$ref": "#/definitions/constvar.RefundSourceType" + } + ] } } }, @@ -14634,22 +15096,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" + } + ] } } }, @@ -15703,6 +16181,13 @@ "request.UpdateReceipt": { "type": "object", "properties": { + "amount": { + "description": "鏀舵閲戦", + "type": "number" + }, + "bankAccount": { + "$ref": "#/definitions/model.BankAccount" + }, "bankAccountId": { "description": "璐︽埛id", "type": "integer" @@ -15722,9 +16207,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", @@ -15744,7 +16240,11 @@ }, "sourceType": { "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級", - "type": "integer" + "allOf": [ + { + "$ref": "#/definitions/constvar.ReceiptSourceType" + } + ] } } }, @@ -16259,6 +16759,18 @@ "description": "閲戦", "type": "number" }, + "amountReceivable": { + "description": "搴旀敹閲戦", + "type": "number" + }, + "amountReceived": { + "description": "宸叉敹閲戦", + "type": "number" + }, + "amountTotal": { + "description": "鎬婚", + "type": "number" + }, "collectionDate": { "description": "璁″垝鏀舵鏃ユ湡", "type": "string" @@ -16296,10 +16808,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" @@ -16698,6 +17214,17 @@ } } }, + "request.UpdateServiceOrderStatus": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "name": { + "type": "string" + } + } + }, "request.UpdateServiceType": { "type": "object", "properties": { -- Gitblit v1.8.0