From 17aaed743ab7a3520ec8eb9e4ab7c776ca807cdd Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 12 十月 2023 20:43:16 +0800
Subject: [PATCH] bug修改
---
service/salesReturn.go | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/service/salesReturn.go b/service/salesReturn.go
index b7362f4..4363b78 100644
--- a/service/salesReturn.go
+++ b/service/salesReturn.go
@@ -3,6 +3,7 @@
import (
"aps_crm/constvar"
"aps_crm/model"
+ "aps_crm/model/request"
"aps_crm/pkg/ecode"
"github.com/shopspring/decimal"
"gorm.io/gorm"
@@ -123,12 +124,14 @@
return ecode.OK
}
-func (SalesReturnService) GetSalesReturnList(page, pageSize int, keywordType constvar.SalesReturnKeywordType, keyword string) ([]*model.SalesReturn, int64, int) {
+func (SalesReturnService) GetSalesReturnList(params request.GetSalesReturnList) ([]*model.SalesReturn, int64, int) {
// get contact list
contacts, total, err := model.NewSalesReturnSearch().
- SetKeywordType(keywordType).
- SetKeyword(keyword).
- SetPage(page, pageSize).
+ SetKeywordType(params.KeywordType).
+ SetKeyword(params.Keyword).
+ SetPage(params.Page, params.PageSize).
+ SetSourceId(params.SourceId).
+ SetSourceType(params.SourceType).
SetPreload(true).
FindAll()
if err != nil {
--
Gitblit v1.8.0