From cd9a3c446cff66e589cdb26163c3e2baf4bc6a1e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 30 八月 2023 13:37:19 +0800
Subject: [PATCH] fix
---
service/serviceFeeManage.go | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/service/serviceFeeManage.go b/service/serviceFeeManage.go
index e067ef2..49fa66c 100644
--- a/service/serviceFeeManage.go
+++ b/service/serviceFeeManage.go
@@ -1,6 +1,7 @@
package service
import (
+ "aps_crm/constvar"
"aps_crm/model"
"aps_crm/pkg/ecode"
"aps_crm/pkg/mysqlx"
@@ -27,19 +28,6 @@
tx.Commit()
- return ecode.OK
-}
-
-func (FeeManageService) DeleteServiceFeeManage(id int) int {
- _, err := model.NewServiceFeeManageSearch(nil).SetId(id).Find()
- if err != nil {
- return ecode.ServiceFeeManageNotExist
- }
-
- err = model.NewServiceFeeManageSearch(nil).SetId(id).Delete()
- if err != nil {
- return ecode.ServiceFeeManageNotExist
- }
return ecode.OK
}
@@ -70,11 +58,24 @@
return ecode.OK
}
-func (FeeManageService) GetServiceFeeManageList(page, pageSize int, keyword string) ([]*model.ServiceFeeManage, int) {
- // get contact list
- contacts, err := model.NewServiceFeeManageSearch(nil).SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+func (FeeManageService) DeleteServiceFeeManage(ids []int) int {
+ // delete client
+ err := model.NewServiceFeeManageSearch(nil).SetIds(ids).Delete()
if err != nil {
- return nil, ecode.ServiceFeeManageListErr
+ return ecode.ServiceFeeManageDeleteErr
}
- return contacts, ecode.OK
+ return ecode.OK
+}
+
+func (FeeManageService) GetServiceFeeManageList(page, pageSize int, queryClass constvar.ServiceFeeQueryClass, keywordType constvar.ServiceFeeKeywordType, keyword string) ([]*model.ServiceFeeManage, int64, int) {
+ // get contact list
+ contacts, total, err := model.NewServiceFeeManageSearch(nil).
+ SetQueryClass(queryClass).
+ SetKeywordType(keywordType).
+ SetKeyword(keyword).
+ SetPage(page, pageSize).FindAll()
+ if err != nil {
+ return nil, 0, ecode.ServiceFeeManageListErr
+ }
+ return contacts, total, ecode.OK
}
--
Gitblit v1.8.0