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/saleChance.go | 63 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/service/saleChance.go b/service/saleChance.go
index c609f25..2c62a4f 100644
--- a/service/saleChance.go
+++ b/service/saleChance.go
@@ -8,43 +8,33 @@
type SaleChanceService struct{}
func (SaleChanceService) AddSaleChance(saleChange *model.SaleChance) int {
- err := model.NewSaleChangeSearch().Create(saleChange)
+ err := model.NewSaleChanceSearch().Create(saleChange)
if err != nil {
- return ecode.SaleChangeExist
+ return ecode.SaleChanceExist
}
return ecode.OK
}
func (SaleChanceService) DeleteSaleChance(id int) int {
// check saleChange exist
- _, err := model.NewSaleChangeSearch().SetId(id).Find()
+ _, err := model.NewSaleChanceSearch().SetId(id).Find()
if err != nil {
- return ecode.SaleChangeNotExist
+ return ecode.SaleChanceNotExist
}
// delete saleChange
- err = model.NewSaleChangeSearch().SetId(id).Delete()
+ err = model.NewSaleChanceSearch().SetId(id).Delete()
if err != nil {
- return ecode.SaleChangeDeleteErr
+ return ecode.SaleChanceDeleteErr
}
return ecode.OK
}
-func (SaleChanceService) GetSaleChanceList() (int, []*model.SaleChance) {
- // get saleChange list
- saleChanges, err := model.NewSaleChangeSearch().FindAll()
- if err != nil {
- return ecode.SaleChangeListErr, nil
- }
-
- return ecode.OK, saleChanges
-}
-
func (SaleChanceService) UpdateSaleChance(saleChange *model.SaleChance) int {
// update saleChange
- err := model.NewSaleChangeSearch().SetId(saleChange.Id).Update(saleChange)
+ err := model.NewSaleChanceSearch().SetId(saleChange.Id).Update(saleChange)
if err != nil {
- return ecode.SaleChangeUpdateErr
+ return ecode.SaleChanceUpdateErr
}
return ecode.OK
@@ -52,13 +42,44 @@
// CheckSaleChangeExist check saleChange exist
func CheckSaleChangeExist(id int) int {
- tmp, err := model.NewSaleChangeSearch().SetId(id).Find()
+ tmp, err := model.NewSaleChanceSearch().SetId(id).Find()
if err != nil {
- return ecode.SaleChangeNotExist
+ return ecode.SaleChanceNotExist
}
if tmp.Id == 0 {
- return ecode.SaleChangeNotExist
+ return ecode.SaleChanceNotExist
+ }
+
+ return ecode.OK
+}
+
+func (SaleChanceService) GetSaleChanceList(page, pageSize int, data map[string]interface{}) ([]*model.SaleChance, int64, int) {
+ // get contact list
+ contacts, total, err := model.NewSaleChanceSearch().SetPage(page, pageSize).SetSearchMap(data).FindAll()
+ if err != nil {
+ return nil, 0, ecode.SaleChanceListErr
+ }
+ return contacts, total, ecode.OK
+}
+
+// push
+func (SaleChanceService) PushSaleChance(id, step int) int {
+ // check saleChange exist
+ errCode := CheckSaleChangeExist(id)
+ if errCode != ecode.OK {
+ return errCode
+ }
+ // check step
+ _, err := model.NewSaleStageSearch().SetId(step).Find()
+ if err != nil {
+ return ecode.SaleStageNotExist
+ }
+
+ // push saleChange
+ err = model.NewSaleChanceSearch().SetId(id).Update(&model.SaleChance{SaleStageId: step})
+ if err != nil {
+ return ecode.SaleChanceUpdateErr
}
return ecode.OK
--
Gitblit v1.8.0