From 7f8a45a749419c3da5b81c4683f0b8034f5280f3 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 25 七月 2023 15:20:09 +0800
Subject: [PATCH] fix

---
 api/v1/salesReturn.go |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/api/v1/salesReturn.go b/api/v1/salesReturn.go
index bcc4692..de7e59b 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)
@@ -86,6 +86,8 @@
 		ctx.Fail(errCode)
 		return
 	}
+
+	salesReturn.Id = params.Id
 
 	errCode = salesReturnService.UpdateSalesReturn(&salesReturn)
 	if errCode != ecode.OK {
@@ -102,7 +104,7 @@
 //	@Tags		SalesReturn
 //	@Summary	鑾峰彇閿�鍞��璐у垪琛�
 //	@Produce	application/json
-//	@Success	200	{object}	contextx.Response{}
+//	@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)
@@ -122,17 +124,17 @@
 }
 
 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,7 +146,7 @@
 	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
 

--
Gitblit v1.8.0