From b4400a06b5f801bc7a85320680d0b6c45c547ff0 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 28 七月 2023 10:21:33 +0800
Subject: [PATCH] fix

---
 api/v1/salesReturn.go |   78 +++++++++++++++++++++------------------
 1 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/api/v1/salesReturn.go b/api/v1/salesReturn.go
index bcc4692..20b1949 100644
--- a/api/v1/salesReturn.go
+++ b/api/v1/salesReturn.go
@@ -73,7 +73,7 @@
 //	@Produce	application/json
 //	@Param		object	body		request.UpdateSalesReturnRequest	true	"鏌ヨ鍙傛暟"
 //	@Success	200		{object}	contextx.Response{}
-//	@Router		/api/salesReturn/update/{id} [put]
+//	@Router		/api/salesReturn/update [put]
 func (s *SalesReturnApi) Update(c *gin.Context) {
 	var params request.UpdateSalesReturnRequest
 	ctx, ok := contextx.NewContext(c, &params)
@@ -87,6 +87,8 @@
 		return
 	}
 
+	salesReturn.Id = params.Id
+
 	errCode = salesReturnService.UpdateSalesReturn(&salesReturn)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
@@ -97,42 +99,19 @@
 
 }
 
-// List
-//
-//	@Tags		SalesReturn
-//	@Summary	鑾峰彇閿�鍞��璐у垪琛�
-//	@Produce	application/json
-//	@Success	200	{object}	contextx.Response{}
-//	@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
-	}
-
-	if salesReturn.Repository == "" {
-		return ecode.InvalidParams, s
-	}
-
-	if salesReturn.MemberId == 0 {
-		return ecode.InvalidParams, s
-	}
+	//if salesReturn.Number == "" {
+	//	return ecode.InvalidParams, s
+	//}
+	//
+	//if salesReturn.Repository == "" {
+	//	return ecode.InvalidParams, s
+	//}
+	//
+	//if salesReturn.MemberId == 0 {
+	//	return ecode.InvalidParams, s
+	//}
 
 	t, err := checkTimeFormat(salesReturn.ReturnDate)
 	if err != nil {
@@ -144,9 +123,36 @@
 	s.Number = salesReturn.Number
 	s.Repository = salesReturn.Repository
 	s.MemberId = salesReturn.MemberId
-	s.Status = salesReturn.Status
+	s.SalesReturnStatus = salesReturn.Status
 	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),
+	})
+}
\ No newline at end of file

--
Gitblit v1.8.0