From 6acff3ce321e59b03e95fe7143ba45b0c48cd926 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 18:00:13 +0800
Subject: [PATCH] fix

---
 api/v1/salesRefund.go |   66 ++++++++++++---------------------
 1 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/api/v1/salesRefund.go b/api/v1/salesRefund.go
index 77d24f7..fcc02e1 100644
--- a/api/v1/salesRefund.go
+++ b/api/v1/salesRefund.go
@@ -98,61 +98,43 @@
 	ctx.Ok()
 }
 
+func checkSalesRefundParams(salesRefund request.SalesRefund) (errCode int, salesRefundRes model.SalesRefund) {
+	salesRefundRes.RefundDate = salesRefund.RefundDate
+	salesRefundRes.ClientId = salesRefund.ClientId
+	salesRefundRes.Number = salesRefund.Number
+	salesRefundRes.MemberId = salesRefund.MemberId
+	salesRefundRes.PaymentTypeId = salesRefund.PaymentTypeId
+	salesRefundRes.BankAccountId = salesRefund.BankAccountId
+	salesRefundRes.IsInvoice = salesRefund.IsInvoice
+	salesRefundRes.Reason = salesRefund.Reason
+	salesRefundRes.Products = salesRefund.Products
+
+	return ecode.OK, salesRefundRes
+}
+
 // List
 //
 //	@Tags		SalesRefund
-//	@Summary	閿�鍞��娆惧垪琛�
+//	@Summary	閿�鍞��娆惧崟鍒楄〃
 //	@Produce	application/json
-//	@Success	200	{object}	contextx.Response{data=response.SalesRefundResponse}
-//	@Router		/api/salesRefund/list [get]
-func (s *SalesRefundApi) List(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+//	@Param		object	body		request.GetSalesRefundList	true	"鍙傛暟"
+//	@Success	200		{object}	contextx.Response{data=response.SalesRefundResponse}
+//	@Router		/api/salesRefund/list [post]
+func (con *SalesRefundApi) List(c *gin.Context) {
+	var params request.GetSalesRefundList
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	list, errCode := salesRefundService.GetSalesRefundList()
+	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: list,
+		List:  salesRefunds,
+		Count: int(total),
 	})
-
-}
-
-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.ClientId = salesRefund.ClientId
-	salesRefundRes.Number = salesRefund.Number
-	salesRefundRes.MemberId = salesRefund.MemberId
-	salesRefundRes.RefundMethod = salesRefund.RefundMethod
-	salesRefundRes.AccountId = salesRefund.AccountId
-	salesRefundRes.IsInvoice = salesRefund.IsInvoice
-	salesRefundRes.Reason = salesRefund.Reason
-	salesRefundRes.Products = salesRefund.Products
-
-	return ecode.OK, salesRefundRes
 }

--
Gitblit v1.8.0