no message

models/admin.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"github.com/beego/beego/v2/client/orm"
+	"hongze/hongze_cygx/utils"
 	"time"
 )
 
@@ -125,3 +126,15 @@ func GetUserSellerRelationUserList() (items []*GetSellerUserMobileResp, err erro
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
+
+// 根据多个ID获取管理员列表信息
+func GetAdminByAdminIds(adminId []int) (items []*AdminMobileResp, err error) {
+	lenArr := len(adminId)
+	if lenArr == 0 {
+		return
+	}
+	o := orm.NewOrmUsingDB("weekly_report")
+	sql := ` SELECT mobile  FROM admin  WHERE admin_id  IN (` + utils.GetOrmInReplace(lenArr) + `)`
+	_, err = o.Raw(sql, adminId).QueryRows(&items)
+	return
+}

services/activity.go

@@ -2254,7 +2254,14 @@ func ArticleUserRemind(user *models.WxUserItem, articleDetail *models.ArticleDet
 	}
 	if sellerItemQy != nil {
 		articleId := articleDetail.ArticleId
-		openIdList, e := models.GetWxOpenIdByMobileList(sellerItemQy.Mobile)
+
+		sllerAndShareMobileArr, e := GetCompanySellerAndShareMobileByRai(user.CompanyId) //获取所属销售以及对应销售的手机号
+		if e != nil {
+			err = errors.New("GetCompanySellerAndShareMobileByRai, Err: " + e.Error())
+			return
+		}
+		sllerAndShareMobiles := strings.Join(sllerAndShareMobileArr, ",")
+		openIdList, e := models.GetWxOpenIdByMobileList(sllerAndShareMobiles)
 		if err != nil {
 			err = errors.New("GetWxOpenIdByMobileList, Err: " + e.Error())
 			return err
@@ -2332,7 +2339,15 @@ func ActivityUserRemind(user *models.WxUserItem, activityDetail *models.Activity
 	} else if source == 4 {
 		sourceMsg = "活动报名"
 	}
-	openIdList, e := models.GetUserRecordListByMobile(4, sellerItemQy.Mobile)
+
+	sllerAndShareMobileArr, e := GetCompanySellerAndShareMobileByRai(user.CompanyId) //获取所属销售以及对应销售的手机号
+	if e != nil {
+		err = errors.New("GetCompanySellerAndShareMobileByRai, Err: " + e.Error())
+		return
+	}
+	sllerAndShareMobiles := strings.Join(sllerAndShareMobileArr, ",")
+
+	openIdList, e := models.GetUserRecordListByMobile(4, sllerAndShareMobiles)
 	if e != nil {
 		err = errors.New("GetUserRecordListByMobile, Err: " + e.Error())
 		return err
@@ -2841,7 +2856,13 @@ func ActivityVideoUserRmind(user *models.WxUserItem, activityId, fileType int) (
 		return err
 	}
 	if sellerItemQy != nil {
-		openIdList, e := models.GetWxOpenIdByMobileList(sellerItemQy.Mobile)
+		sllerAndShareMobileArr, e := GetCompanySellerAndShareMobileByRai(user.CompanyId) //获取所属销售以及对应销售的手机号
+		if e != nil {
+			err = errors.New("GetCompanySellerAndShareMobileByRai, Err: " + e.Error())
+			return
+		}
+		sllerAndShareMobiles := strings.Join(sllerAndShareMobileArr, ",")
+		openIdList, e := models.GetWxOpenIdByMobileList(sllerAndShareMobiles)
 		if e != nil {
 			err = errors.New("GetSellerByAdminId, Err: " + e.Error())
 			return

services/activity_special_trip.go

@@ -430,7 +430,14 @@ func ActivitySpecialUserRmind(user *models.WxUserItem, activityId, TripStatus in
 		return err
 	}
 	if sellerItemQy != nil {
-		openIdList, e := models.GetWxOpenIdByMobileList(sellerItemQy.Mobile)
+
+		sllerAndShareMobileArr, e := GetCompanySellerAndShareMobileByRai(user.CompanyId) //获取所属销售以及对应销售的手机号
+		if e != nil {
+			err = errors.New("GetCompanySellerAndShareMobileByRai, Err: " + e.Error())
+			return
+		}
+		sllerAndShareMobiles := strings.Join(sllerAndShareMobileArr, ",")
+		openIdList, e := models.GetWxOpenIdByMobileList(sllerAndShareMobiles)
 		if e != nil {
 			err = errors.New("GetSellerByAdminId, Err: " + e.Error())
 			return

services/admin.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"hongze/hongze_cygx/models"
+	"hongze/hongze_cygx/models/company"
 	"hongze/hongze_cygx/utils"
 	"strconv"
 	"strings"
@@ -159,3 +160,33 @@ func GetSelleridWhichGroup(companyId, productId int, mobile string) (adminIds st
 	}
 	return
 }
+
+// 根据公司ID获取权益销售、共享销售手机号
+func GetCompanySellerAndShareMobileByRai(companyId int) (mobiles []string, err error) {
+	productDetail, e := company.GetCompanyProductDetailByCompanyId(companyId, 2)
+	if e != nil {
+		err = errors.New("GetCompanyProductDetailByCompanyId, Err: " + e.Error())
+		return
+	}
+
+	var adminIds []int
+	adminIds = append(adminIds, productDetail.SellerId)
+	if productDetail.ShareSellerId > 0 {
+		adminIds = append(adminIds, productDetail.ShareSellerId)
+	}
+
+	listAdmin, e := models.GetAdminByAdminIds(adminIds)
+	if e != nil {
+		err = errors.New("GetAdminByAdminIds, Err: " + e.Error())
+		return
+	}
+
+	mobiles = make([]string, 0)
+	for _, v := range listAdmin {
+		if v.Mobile != "" {
+			mobiles = append(mobiles, v.Mobile)
+		}
+	}
+
+	return
+}

services/keyword.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
+	"strings"
 	"time"
 )
 
@@ -94,7 +95,14 @@ func SearchKeywordUserRmind(user *models.WxUserItem, keyWord string) (err error)
 		return
 	}
 	if sellerItemQy != nil {
-		openIdList, e := models.GetWxOpenIdByMobileList(sellerItemQy.Mobile)
+
+		sllerAndShareMobileArr, e := GetCompanySellerAndShareMobileByRai(user.CompanyId) //获取所属销售以及对应销售的手机号
+		if e != nil {
+			err = errors.New("GetCompanySellerAndShareMobileByRai, Err: " + e.Error())
+			return
+		}
+		sllerAndShareMobiles := strings.Join(sllerAndShareMobileArr, ",")
+		openIdList, e := models.GetWxOpenIdByMobileList(sllerAndShareMobiles)
 		if e != nil {
 			err = errors.New("GetSellerByAdminId, Err: " + e.Error())
 			return

services/micro_roadshow.go

@@ -939,7 +939,13 @@ func MicroRoadshowVideoUserRmind(user *models.WxUserItem, videoId int) (err erro
 		return err
 	}
 	if sellerItemQy != nil {
-		openIdList, e := models.GetWxOpenIdByMobileList(sellerItemQy.Mobile)
+		sllerAndShareMobileArr, e := GetCompanySellerAndShareMobileByRai(user.CompanyId) //获取所属销售以及对应销售的手机号
+		if e != nil {
+			err = errors.New("GetCompanySellerAndShareMobileByRai, Err: " + e.Error())
+			return
+		}
+		sllerAndShareMobiles := strings.Join(sllerAndShareMobileArr, ",")
+		openIdList, e := models.GetWxOpenIdByMobileList(sllerAndShareMobiles)
 		if e != nil {
 			err = errors.New("GetSellerByAdminId, Err: " + e.Error())
 			return

services/minutes_summary.go

@@ -6,6 +6,7 @@ import (
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -41,7 +42,14 @@ func MinutesSummaryHistoryUserRmind(user *models.WxUserItem, articleId int) (err
 		return err
 	}
 	if sellerItemQy != nil {
-		openIdList, e := models.GetWxOpenIdByMobileList(sellerItemQy.Mobile)
+
+		sllerAndShareMobileArr, e := GetCompanySellerAndShareMobileByRai(user.CompanyId) //获取所属销售以及对应销售的手机号
+		if e != nil {
+			err = errors.New("GetCompanySellerAndShareMobileByRai, Err: " + e.Error())
+			return
+		}
+		sllerAndShareMobiles := strings.Join(sllerAndShareMobileArr, ",")
+		openIdList, e := models.GetWxOpenIdByMobileList(sllerAndShareMobiles)
 		if e != nil {
 			err = errors.New("GetSellerByAdminId, Err: " + e.Error())
 			return

services/product_interior.go

@@ -283,7 +283,14 @@ func ProductInteriorHistoryUserRmind(user *models.WxUserItem, productInteriorId
 		return err
 	}
 	if sellerItemQy != nil {
-		openIdList, e := models.GetWxOpenIdByMobileList(sellerItemQy.Mobile)
+
+		sllerAndShareMobileArr, e := GetCompanySellerAndShareMobileByRai(user.CompanyId) //获取所属销售以及对应销售的手机号
+		if e != nil {
+			err = errors.New("GetCompanySellerAndShareMobileByRai, Err: " + e.Error())
+			return
+		}
+		sllerAndShareMobiles := strings.Join(sllerAndShareMobileArr, ",")
+		openIdList, e := models.GetWxOpenIdByMobileList(sllerAndShareMobiles)
 		if e != nil {
 			err = errors.New("GetSellerByAdminId, Err: " + e.Error())
 			return

services/research_summary.go

@@ -6,6 +6,7 @@ import (
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -41,7 +42,14 @@ func ResearchSummaryHistoryUserRmind(user *models.WxUserItem, articleId int) (er
 		return err
 	}
 	if sellerItemQy != nil {
-		openIdList, e := models.GetWxOpenIdByMobileList(sellerItemQy.Mobile)
+
+		sllerAndShareMobileArr, e := GetCompanySellerAndShareMobileByRai(user.CompanyId) //获取所属销售以及对应销售的手机号
+		if e != nil {
+			err = errors.New("GetCompanySellerAndShareMobileByRai, Err: " + e.Error())
+			return
+		}
+		sllerAndShareMobiles := strings.Join(sllerAndShareMobileArr, ",")
+		openIdList, e := models.GetWxOpenIdByMobileList(sllerAndShareMobiles)
 		if e != nil {
 			err = errors.New("GetSellerByAdminId, Err: " + e.Error())
 			return