From 5dbc6216fa75459f3af5c0ba7736ec3ec8ad7a0e Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 17 八月 2023 09:34:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
service/serviceFeeManage.go | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/service/serviceFeeManage.go b/service/serviceFeeManage.go
index 45bd4fa..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"
@@ -30,28 +31,6 @@
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
-}
-
-func (FeeManageService) GetServiceFeeManageList() ([]*model.ServiceFeeManage, int) {
- list, err := model.NewServiceFeeManageSearch(nil).FindAll()
- if err != nil {
- return nil, ecode.ServiceFeeManageListErr
- }
-
- return list, ecode.OK
-}
-
func (FeeManageService) UpdateServiceFeeManage(serviceFeeManage *model.ServiceFeeManage) int {
// check serviceFeeManage exist
_, err := model.NewServiceFeeManageSearch(nil).SetId(serviceFeeManage.Id).Find()
@@ -78,3 +57,25 @@
return ecode.OK
}
+
+func (FeeManageService) DeleteServiceFeeManage(ids []int) int {
+ // delete client
+ err := model.NewServiceFeeManageSearch(nil).SetIds(ids).Delete()
+ if err != nil {
+ return ecode.ServiceFeeManageDeleteErr
+ }
+ 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