From eb65f4c3c6903b11424eeaefe46653acedf24448 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 08 八月 2023 09:40:22 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 service/salesLeads.go |  158 +++++++++++++++++++++++++---------------------------
 1 files changed, 76 insertions(+), 82 deletions(-)

diff --git a/service/salesLeads.go b/service/salesLeads.go
index f31fd9a..fc960e3 100644
--- a/service/salesLeads.go
+++ b/service/salesLeads.go
@@ -1,82 +1,76 @@
-package service
-
-import (
-	"aps_crm/model"
-	"aps_crm/pkg/ecode"
-)
-
-type SalesLeadsService struct{}
-
-func (SalesLeadsService) AddSalesLeads(salesLeads *model.SalesLeads) int {
-	err := model.NewSalesLeadsSearch().Create(salesLeads)
-	if err != nil {
-		return ecode.SalesLeadsExist
-	}
-	return ecode.OK
-}
-
-func (SalesLeadsService) DeleteSalesLeads(id int) int {
-	// check salesLeads exist
-	_, err := model.NewSalesLeadsSearch().SetId(id).Find()
-	if err != nil {
-		return ecode.SalesLeadsNotExist
-	}
-
-	// delete salesLeads
-	err = model.NewSalesLeadsSearch().SetId(id).Delete()
-	if err != nil {
-		return ecode.SalesLeadsDeleteErr
-	}
-	return ecode.OK
-}
-
-func (SalesLeadsService) UpdateSalesLeads(salesLeads *model.SalesLeads) int {
-	// update salesLeads
-	err := model.NewSalesLeadsSearch().SetId(salesLeads.Id).Update(salesLeads)
-	if err != nil {
-		return ecode.SalesLeadsUpdateErr
-	}
-
-	return ecode.OK
-}
-
-// CheckSalesLeadsExist check salesLeads exist
-func CheckSalesLeadsExist(id int) int {
-	tmp, err := model.NewSalesLeadsSearch().SetId(id).Find()
-	if err != nil {
-		return ecode.SalesLeadsNotExist
-	}
-
-	if len(tmp) == 0 {
-		return ecode.SalesLeadsNotExist
-	}
-
-	return ecode.OK
-}
-
-func (SalesLeadsService) GetSalesLeadsList(page, pageSize int, keyword string) ([]*model.SalesLeads, int64, int) {
-	// get contact list
-	contacts, total, err := model.NewSalesLeadsSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
-	if err != nil {
-		return nil, 0, ecode.SalesLeadsListErr
-	}
-	return contacts, total, ecode.OK
-}
-
-func (SalesLeadsService) Assign(id, memberId int) int {
-	// check salesLeads exist
-	errCode := CheckSalesLeadsExist(id)
-	if errCode != ecode.OK {
-		return errCode
-	}
-
-	// update salesLeads
-	err := model.NewSalesLeadsSearch().SetId(id).UpdateMap(map[string]interface{}{
-		"member_id": memberId,
-	})
-	if err != nil {
-		return ecode.SalesLeadsUpdateErr
-	}
-
-	return ecode.OK
-}
+package service
+
+import (
+	"aps_crm/model"
+	"aps_crm/pkg/ecode"
+)
+
+type SalesLeadsService struct{}
+
+func (SalesLeadsService) AddSalesLeads(salesLeads *model.SalesLeads) int {
+	err := model.NewSalesLeadsSearch(nil).Create(salesLeads)
+	if err != nil {
+		return ecode.SalesLeadsExist
+	}
+	return ecode.OK
+}
+
+func (SalesLeadsService) UpdateSalesLeads(salesLeads *model.SalesLeads) int {
+	// update salesLeads
+	err := model.NewSalesLeadsSearch(nil).SetId(salesLeads.Id).Update(salesLeads)
+	if err != nil {
+		return ecode.SalesLeadsUpdateErr
+	}
+
+	return ecode.OK
+}
+
+// CheckSalesLeadsExist check salesLeads exist
+func CheckSalesLeadsExist(id int) int {
+	tmp, err := model.NewSalesLeadsSearch(nil).SetId(id).Find()
+	if err != nil {
+		return ecode.SalesLeadsNotExist
+	}
+
+	if len(tmp) == 0 {
+		return ecode.SalesLeadsNotExist
+	}
+
+	return ecode.OK
+}
+
+func (SalesLeadsService) GetSalesLeadsList(page, pageSize int, keyword string) ([]*model.SalesLeads, int64, int) {
+	// get contact list
+	contacts, total, err := model.NewSalesLeadsSearch(nil).SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+	if err != nil {
+		return nil, 0, ecode.SalesLeadsListErr
+	}
+	return contacts, total, ecode.OK
+}
+
+func (SalesLeadsService) Assign(ids []int, memberId int) int {
+	// check salesLeads exist
+	//errCode := CheckSalesLeadsExist(id)
+	//if errCode != ecode.OK {
+	//	return errCode
+	//}
+
+	// update salesLeads
+	err := model.NewSalesLeadsSearch(nil).SetIds(ids).UpdateMap(map[string]interface{}{
+		"member_id": memberId,
+	})
+	if err != nil {
+		return ecode.SalesLeadsUpdateErr
+	}
+
+	return ecode.OK
+}
+
+func (SalesLeadsService) DeleteSalesLeads(ids []int) int {
+	// delete client
+	err := model.NewSalesLeadsSearch(nil).SetIds(ids).Delete()
+	if err != nil {
+		return ecode.SalesLeadsDeleteErr
+	}
+	return ecode.OK
+}

--
Gitblit v1.8.0