no message

services/article_apply_appointment_expert.go

@@ -6,6 +6,7 @@ import (
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -52,26 +53,51 @@ func SendArticleApplyAppointmentExpertTemplateMsg(user *models.WxUserItem, artic
 			go utils.SendAlarmMsg("活动带问提醒发送模版消息失败"+msg, 2)
 		}
 	}()
+	//文章详情
+	detailArticle, e := models.GetArticleDetailById(articleId)
+	if e != nil {
+		err = errors.New("GetArticleDetailById, Err: " + e.Error())
+		return
+	}
+
+	var mobiles []string
 	//获取权益销售
-	sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	sellerItem, e := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
+	if e != nil {
+		err = errors.New("GetAdminByRoleName, Err: " + e.Error())
 		return
 	}
-	if sellerItem == nil {
+	//内容组全员手机号
+	configCode := utils.TPL_MSG_NEI_RONG_ZU
+	cnf, e := models.GetConfigByCode(configCode)
+	if e != nil {
+		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
 		return
 	}
-	//文章详情
-	detailArticle, e := models.GetArticleDetailById(articleId)
+
+	//汪洋手机号
+	cnfWangYang, e := models.GetConfigByCode(utils.TPL_MSG_WANG_YANG)
 	if e != nil {
-		err = errors.New("GetArticleDetailById, Err: " + e.Error())
+		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
 		return
 	}
-	//销售对应的Openid
-	openIdList, e := models.GetWxOpenIdByMobileList(sellerItem.Mobile)
+
+	mobiles = append(mobiles, sellerItem.Mobile)
+	mobiles = append(mobiles, cnfWangYang.ConfigValue)
+	listMobile := strings.Split(cnf.ConfigValue, ",")
+	for _, v := range listMobile {
+		mobiles = append(mobiles, v)
+	}
+
+	openIdList, e := models.GetWxOpenIdByMobileSliceList(mobiles)
 	if e != nil {
-		err = errors.New("GetWxOpenIdByMobileList, Err: " + e.Error())
+		err = errors.New("GetWxOpenIdByMobileSliceList, Err: " + e.Error() + configCode)
 		return
 	}
+	if len(openIdList) == 0 {
+		return
+	}
+
 	if len(openIdList) == 0 {
 		return
 	}

services/banner_yx_survey.go

@@ -6,6 +6,7 @@ import (
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -43,7 +44,7 @@ func AddCygxBannerYxSurvey(user *models.WxUserItem, content string) (err error)
 	return
 }
 
-// 用户提交研选调研需求，向对应销售发送模版消息
+// 用户提交研选调研需求，给汪洋、对口销售、内容组全员发模板消息
 func SendCygxBannerYxSurveyTemplateMsg(user *models.WxUserItem, content string, articleId int) (err error) {
 	var msg string
 	msg = fmt.Sprint(user, articleId)
@@ -52,19 +53,39 @@ func SendCygxBannerYxSurveyTemplateMsg(user *models.WxUserItem, content string,
 			go utils.SendAlarmMsg("SendCygxBannerYxSurveyTemplateMsg Err"+msg, 2)
 		}
 	}()
+
+	var mobiles []string
 	//获取权益销售
-	sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	sellerItem, e := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
+	if e != nil {
+		err = errors.New("GetAdminByRoleName, Err: " + e.Error())
 		return
 	}
-	if sellerItem == nil {
+	//内容组全员手机号
+	configCode := utils.TPL_MSG_NEI_RONG_ZU
+	cnf, e := models.GetConfigByCode(configCode)
+	if e != nil {
+		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
 		return
 	}
 
-	//销售对应的Openid
-	openIdList, e := models.GetWxOpenIdByMobileList(sellerItem.Mobile)
+	//汪洋手机号
+	cnfWangYang, e := models.GetConfigByCode(utils.TPL_MSG_WANG_YANG)
+	if e != nil {
+		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
+		return
+	}
+
+	mobiles = append(mobiles, sellerItem.Mobile)
+	mobiles = append(mobiles, cnfWangYang.ConfigValue)
+	listMobile := strings.Split(cnf.ConfigValue, ",")
+	for _, v := range listMobile {
+		mobiles = append(mobiles, v)
+	}
+
+	openIdList, e := models.GetWxOpenIdByMobileSliceList(mobiles)
 	if e != nil {
-		err = errors.New("GetWxOpenIdByMobileList, Err: " + e.Error())
+		err = errors.New("GetWxOpenIdByMobileSliceList, Err: " + e.Error() + configCode)
 		return
 	}
 	if len(openIdList) == 0 {

services/yidong.go

@@ -293,10 +293,10 @@ func GetYiDongActivity(cont context.Context) (err error) {
 			item.ChartPermissionIdDeputy = GetActivityTypeIdWithYiDong(v.IndustrySwName)
 			item.ChartPermissionNameDeputy = GetActivityTypeNameWithYiDong(v.IndustrySwName)
 			item.ChartPermissionNames = item.ChartPermissionName
-			if item.ChartPermissionId != item.ChartPermissionIdDeputy {
-				//如果不是研选行业的活动，默认弘则活动也展示 11.0
-				item.IsShowHz = 1
-			}
+			//if item.ChartPermissionId != item.ChartPermissionIdDeputy {
+
+			item.IsShowHz = 1 //默认弘则活动也展示 11.0
+			//}
 			item.ActivityTime = v.Start
 			item.YidongActivityEndTime = v.End
 			item.YidongSignUpStart = v.SignUpStart