From 0ce02d3f2ccd767c50efe5f2e0211ec24f1583b3 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 15 八月 2023 10:26:37 +0800
Subject: [PATCH] fix
---
api/v1/salesReturn.go | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/api/v1/salesReturn.go b/api/v1/salesReturn.go
index 5ada12a..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
@@ -145,14 +139,14 @@
return
}
- salesReturns, errCode := salesReturnService.GetSalesReturnList(params.Page, params.PageSize, params.Keyword)
+ 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: len(salesReturns),
+ List: salesReturns,
+ Count: int(total),
})
}
--
Gitblit v1.8.0