From 2def11ba83760b5be1361f10c3756cc0e9cfd165 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 14 八月 2023 09:32:13 +0800
Subject: [PATCH] merge
---
api/v1/salesRefund.go | 33 ++++++---------------------------
1 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/api/v1/salesRefund.go b/api/v1/salesRefund.go
index 8da5dd5..fcc02e1 100644
--- a/api/v1/salesRefund.go
+++ b/api/v1/salesRefund.go
@@ -98,34 +98,13 @@
ctx.Ok()
}
-
func checkSalesRefundParams(salesRefund request.SalesRefund) (errCode int, salesRefundRes model.SalesRefund) {
- //if salesRefund.ClientId == 0 {
- // return ecode.InvalidParams, salesRefundRes
- //}
- //
- //if salesRefund.Number == "" {
- // return ecode.InvalidParams, salesRefundRes
- //}
- //
- //if salesRefund.MemberId == 0 {
- // return ecode.InvalidParams, salesRefundRes
- //}
- //
- //if salesRefund.RefundDate == "" {
- // return ecode.InvalidParams, salesRefundRes
- //}
-
- t, err := checkTimeFormat(salesRefund.RefundDate)
- if err != nil {
- return ecode.InvalidParams, salesRefundRes
- }
- salesRefundRes.RefundDate = t
+ salesRefundRes.RefundDate = salesRefund.RefundDate
salesRefundRes.ClientId = salesRefund.ClientId
salesRefundRes.Number = salesRefund.Number
salesRefundRes.MemberId = salesRefund.MemberId
- salesRefundRes.RefundMethod = salesRefund.RefundMethod
- salesRefundRes.AccountId = salesRefund.AccountId
+ salesRefundRes.PaymentTypeId = salesRefund.PaymentTypeId
+ salesRefundRes.BankAccountId = salesRefund.BankAccountId
salesRefundRes.IsInvoice = salesRefund.IsInvoice
salesRefundRes.Reason = salesRefund.Reason
salesRefundRes.Products = salesRefund.Products
@@ -148,14 +127,14 @@
return
}
- salesRefunds, total, errCode := salesRefundService.GetSalesRefundList(params.Page, params.PageSize, params.Keyword)
+ salesRefunds, total, errCode := salesRefundService.GetSalesRefundList(params.Page, params.PageSize, params.KeywordType, params.Keyword)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
}
ctx.OkWithDetailed(response.SalesRefundResponse{
- List: salesRefunds,
+ List: salesRefunds,
Count: int(total),
})
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0