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
---
service/salesReturn.go | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/service/salesReturn.go b/service/salesReturn.go
index 6d4a7e3..6a4bab0 100644
--- a/service/salesReturn.go
+++ b/service/salesReturn.go
@@ -7,7 +7,7 @@
type SalesReturnService struct{}
-func (SalesReturnService) AddSalesReturn(salesReturn *model.SalesReturn) int {
+func (slf SalesReturnService) AddSalesReturn(salesReturn *model.SalesReturn) int {
err := model.NewSalesReturnSearch().Create(salesReturn)
if err != nil {
return ecode.SalesReturnExist
@@ -44,11 +44,11 @@
return ecode.OK
}
-func (SalesReturnService) GetSalesReturnList(page, pageSize int, keyword string) ([]*model.SalesReturn, int) {
+func (SalesReturnService) GetSalesReturnList(page, pageSize int, keyword string) ([]*model.SalesReturn, int64, int) {
// get contact list
- contacts, err := model.NewSalesReturnSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewSalesReturnSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
if err != nil {
- return nil, ecode.SalesReturnListErr
+ return nil, 0, ecode.SalesReturnListErr
}
- return contacts, ecode.OK
+ return contacts, total, ecode.OK
}
--
Gitblit v1.8.0