From 115bd9b51f5d8eade4658f844de37516486c60e7 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 18 十一月 2023 17:25:25 +0800
Subject: [PATCH] crm获取aps项目模块信息
---
service/salesLeads.go | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/service/salesLeads.go b/service/salesLeads.go
index f43236b..b3d3363 100644
--- a/service/salesLeads.go
+++ b/service/salesLeads.go
@@ -27,22 +27,22 @@
}
// CheckSalesLeadsExist check salesLeads exist
-func CheckSalesLeadsExist(id int) int {
- tmp, err := model.NewSalesLeadsSearch(nil).SetId(id).Find()
+func CheckSalesLeadsExist(id int) (int, *model.SalesLeads) {
+ tmp, err := model.NewSalesLeadsSearch(nil).SetId(id).First()
if err != nil {
- return ecode.SalesLeadsNotExist
+ return ecode.SalesLeadsNotExist, nil
}
- if len(tmp) == 0 {
- return ecode.SalesLeadsNotExist
+ if tmp.Id == 0 {
+ return ecode.SalesLeadsNotExist, nil
}
- return ecode.OK
+ return ecode.OK, &tmp
}
-func (SalesLeadsService) GetSalesLeadsList(page, pageSize int, keyword string) ([]*model.SalesLeads, int64, int) {
+func (SalesLeadsService) GetSalesLeadsList(page, pageSize int, data map[string]interface{}) ([]*model.SalesLeads, int64, int) {
// get contact list
- contacts, total, err := model.NewSalesLeadsSearch(nil).SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewSalesLeadsSearch(nil).SetPage(page, pageSize).SetSearchMap(data).FindAll()
if err != nil {
return nil, 0, ecode.SalesLeadsListErr
}
@@ -78,11 +78,16 @@
func (SalesLeadsService) PushSalesLeads(id int, step constvar.SalesStatus, txt string) int {
// check salesLeads exist
- errCode := CheckSalesLeadsExist(id)
+ errCode, tmp := CheckSalesLeadsExist(id)
if errCode != ecode.OK {
return errCode
}
+ // check step
+ if tmp.SalesStatus > step && step != constvar.SalesStatusFail {
+ return ecode.SalesLeadsStatusErr
+ }
+
switch step {
case constvar.SalesStatusFail:
err := model.NewSalesLeadsSearch(nil).SetId(id).UpdateMap(map[string]interface{}{
--
Gitblit v1.8.0