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/contact.go | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/service/contact.go b/service/contact.go
index 8333495..daab40e 100644
--- a/service/contact.go
+++ b/service/contact.go
@@ -33,22 +33,6 @@
return ecode.OK
}
-func (ContactService) DeleteContact(id int) int {
- // check contact exist
- _, err := model.NewContactSearch(nil).SetId(id).First()
- if err != nil {
- return ecode.ContactNotExist
- }
-
- // delete contact
- err = model.NewContactSearch(nil).SetId(id).Delete()
- if err != nil {
- return ecode.ContactDeleteErr
- }
- return ecode.OK
-}
-
-
func (ContactService) UpdateContact(contact *model.Contact) int {
// check contact exist
_, err := model.NewContactSearch(nil).SetId(contact.Id).First()
@@ -118,11 +102,38 @@
return ecode.OK
}
-func (ContactService) GetContactList(page, pageSize int, keyword string) ([]*model.ContactDetail, int) {
+func (ContactService) GetContactList(page, pageSize int, data map[string]interface{}) ([]*model.ContactDetail, int64, int) {
// get contact list
- contacts, err := model.NewContactSearch(nil).SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewContactSearch(nil).SetPage(page, pageSize).SetSearchMap(data).FindAll()
if err != nil {
- return nil, ecode.ContactListErr
+ return nil, 0, ecode.ContactListErr
}
- return contacts, ecode.OK
+ return contacts, total, ecode.OK
+}
+
+func (ContactService) DeleteContact(ids []int) int {
+ // delete client
+ err := model.NewContactSearch(nil).SetIds(ids).Delete()
+ if err != nil {
+ return ecode.ContactDeleteErr
+ }
+ return ecode.OK
+}
+
+func (ContactService) Assign(ids []int, memberId int) int {
+ // check contact exist
+ //errCode := CheckContactExist(id)
+ //if errCode != ecode.OK {
+ // return errCode
+ //}
+
+ // assign contact
+ err := model.NewContactSearch(nil).SetIds(ids).UpdateByMap(map[string]interface{}{
+ "member_id": memberId,
+ })
+ if err != nil {
+ return ecode.ContactAssignErr
+ }
+
+ return ecode.OK
}
--
Gitblit v1.8.0