From 20ca649b9f0fa0af0361024149dee6833858c2fa Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 15 八月 2023 17:12:27 +0800
Subject: [PATCH] fix

---
 api/v1/salesReturn.go |   60 +++++++++++++++++++++++++++++-------------------------------
 1 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/api/v1/salesReturn.go b/api/v1/salesReturn.go
index de7e59b..e0c7990 100644
--- a/api/v1/salesReturn.go
+++ b/api/v1/salesReturn.go
@@ -99,30 +99,6 @@
 
 }
 
-// List
-//
-//	@Tags		SalesReturn
-//	@Summary	鑾峰彇閿�鍞��璐у垪琛�
-//	@Produce	application/json
-//	@Success	200	{object}	contextx.Response{data=response.SalesReturnResponse}
-//	@Router		/api/salesReturn/list [get]
-func (s *SalesReturnApi) List(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
-	if !ok {
-		return
-	}
-
-	salesReturns, errCode := salesReturnService.GetSalesReturnList()
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.OkWithDetailed(response.SalesReturnResponse{
-		List: salesReturns,
-	})
-}
-
 func checkSalesReturnParams(salesReturn request.SalesReturn) (errCode int, s model.SalesReturn) {
 	//if salesReturn.Number == "" {
 	//	return ecode.InvalidParams, s
@@ -136,19 +112,41 @@
 	//	return ecode.InvalidParams, s
 	//}
 
-	t, err := checkTimeFormat(salesReturn.ReturnDate)
-	if err != nil {
-		return ecode.InvalidParams, s
-	}
-
 	s.ClientId = salesReturn.ClientId
-	s.ReturnDate = t
+	s.ReturnDate = salesReturn.ReturnDate
 	s.Number = salesReturn.Number
 	s.Repository = salesReturn.Repository
 	s.MemberId = salesReturn.MemberId
-	s.SalesReturnStatus = salesReturn.Status
+	s.SalesReturnStatusId = salesReturn.SalesReturnStatusId
 	s.Reason = salesReturn.Reason
 	s.Products = salesReturn.Products
 
 	return ecode.OK, s
 }
+
+// List
+//
+//	@Tags		SalesReturn
+//	@Summary	閿�鍞��璐у崟鍒楄〃
+//	@Produce	application/json
+//	@Param		object	body		request.GetSalesReturnList	true	"鍙傛暟"
+//	@Success	200		{object}	contextx.Response{data=response.SalesReturnResponse}
+//	@Router		/api/salesReturn/list [post]
+func (con *SalesReturnApi) List(c *gin.Context) {
+	var params request.GetSalesReturnList
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	salesReturns, total, errCode := salesReturnService.GetSalesReturnList(params.Page, params.PageSize, params.Keyword)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.SalesReturnResponse{
+		List:  salesReturns,
+		Count: int(total),
+	})
+}

--
Gitblit v1.8.0