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/salesReturn.go |   76 +++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/api/v1/salesReturn.go b/api/v1/salesReturn.go
index bcc4692..e0c7990 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,56 +99,54 @@
 
 }
 
+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
+	//}
+
+	s.ClientId = salesReturn.ClientId
+	s.ReturnDate = salesReturn.ReturnDate
+	s.Number = salesReturn.Number
+	s.Repository = salesReturn.Repository
+	s.MemberId = salesReturn.MemberId
+	s.SalesReturnStatusId = salesReturn.SalesReturnStatusId
+	s.Reason = salesReturn.Reason
+	s.Products = salesReturn.Products
+
+	return ecode.OK, s
+}
+
 // List
 //
 //	@Tags		SalesReturn
-//	@Summary	鑾峰彇閿�鍞��璐у垪琛�
+//	@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)
+//	@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, errCode := salesReturnService.GetSalesReturnList()
+	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,
+		List:  salesReturns,
+		Count: int(total),
 	})
-}
-
-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
-	}
-
-	t, err := checkTimeFormat(salesReturn.ReturnDate)
-	if err != nil {
-		return ecode.InvalidParams, s
-	}
-
-	s.ClientId = salesReturn.ClientId
-	s.ReturnDate = t
-	s.Number = salesReturn.Number
-	s.Repository = salesReturn.Repository
-	s.MemberId = salesReturn.MemberId
-	s.Status = salesReturn.Status
-	s.Reason = salesReturn.Reason
-	s.Products = salesReturn.Products
-
-	return ecode.OK, s
 }

--
Gitblit v1.8.0