From 2c53a4e2c7ededc1f07324d797430e8d4a0607a1 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 15 八月 2023 20:33:41 +0800
Subject: [PATCH] merge
---
api/v1/salesReturn.go | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/api/v1/salesReturn.go b/api/v1/salesReturn.go
index 20b1949..2a55b45 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
@@ -135,7 +129,9 @@
// @Tags SalesReturn
// @Summary 閿�鍞��璐у崟鍒楄〃
// @Produce application/json
-// @Param object body request.GetSalesReturnList true "鍙傛暟"
+//
+// @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) {
@@ -145,14 +141,14 @@
return
}
- salesReturns, total, errCode := salesReturnService.GetSalesReturnList(params.Page, params.PageSize, params.Keyword)
+ salesReturns, total, errCode := salesReturnService.GetSalesReturnList(params.Page, params.PageSize, params.KeywordType, params.Keyword)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
}
ctx.OkWithDetailed(response.SalesReturnResponse{
- List: salesReturns,
+ List: salesReturns,
Count: int(total),
})
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0