From f84d9c46574a2cd663105859035bc17891270923 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 10:41:54 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
api/v1/salesReturn.go | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/api/v1/salesReturn.go b/api/v1/salesReturn.go
index 20b1949..e0c7990 100644
--- a/api/v1/salesReturn.go
+++ b/api/v1/salesReturn.go
@@ -99,7 +99,6 @@
}
-
func checkSalesReturnParams(salesReturn request.SalesReturn) (errCode int, s model.SalesReturn) {
//if salesReturn.Number == "" {
// return ecode.InvalidParams, s
@@ -113,17 +112,12 @@
// 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
@@ -152,7 +146,7 @@
}
ctx.OkWithDetailed(response.SalesReturnResponse{
- List: salesReturns,
+ List: salesReturns,
Count: int(total),
})
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0