Merge branch 'mfyx_wx_tmp_1.1' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/report.go

@@ -1515,7 +1515,7 @@ func (this *ReportController) CommentAdd() {
 		br.ErrMsg = "提交留言失败,Err:" + err.Error()
 		return
 	}
-	go services.SendCommentWxTemplateMsg(req, user, articleInfo, int(msgId))
+	//go services.SendCommentWxTemplateMsg(req, user, articleInfo, int(msgId))
 	go services.SendCommentWxTemplateMsgByYxCategory(req, user, articleInfo, int(msgId)) // 发送用户留言提醒（研选公众号类目模版消息）
 	br.Ret = 200
 	br.Success = true

models/company.go

@@ -151,7 +151,7 @@ func GetCompanyDetailAllById(companyId int) (item *CompanyDetail, err error) {
 
 // 获取对应销售以及销售的手机号
 func GetSellerDetailAllByCompanyId(companyId int) (item *CompanyDetail, err error) {
-	sql := ` SELECT c.mobile ,c.real_name as seller_name
+	sql := ` SELECT c.mobile ,c.real_name as seller_name,a.company_name
 			FROM
 			company AS a
 			INNER JOIN company_product AS b ON a.company_id = b.company_id

services/wx_template_msg.go

@@ -10,6 +10,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -355,25 +356,33 @@ func SendCommentWxTemplateMsgByYxCategory(req models.AddCygxArticleCommentReq, u
 
 	var keywords []string
 	keyword1 = user.RealName
-	keyword2 = companyItem.CompanyName
+	keyword2 = utils.TruncateActivityNameString(companyItem.CompanyName)
 	keyword3 = companyItem.SellerName
 	keyword4 = time.Now().Format(utils.FormatDateTimeMinute2)
 	keyword5 = "报告留言：" + req.Content
 	keyword5 = utils.TruncateActivityNameString(keyword5)
 	keywords = append(keywords, keyword1, keyword2, keyword3, keyword4, keyword5)
 
-	mobile = companyItem.Mobile + "," + utils.WxMsgTemplateIdAskMsgMobilePublic + "," + utils.ActSendMsgMobile
+	var mobiles []string
+	mobiles = append(mobiles, utils.RAI_MOBILE_GAO_YI_WEN, utils.RAI_MOBILE_DONG_HENG, utils.RAI_MOBILE_WU_ANG_DI_WEN, utils.RAI_MOBILE_GE_LIN_WEN) //葛琳、高亦文、董衡、吴昂迪手机号
+	mobile = companyItem.Mobile + "," + utils.WxMsgTemplateIdAskMsgMobilePublic + "," + strings.Join(mobiles, ",")
+
+	mobile = "15557270714,18767183922"
+	//mobile =
 	openIdList, e := models.GetMfyxWxOpenIdByMobileList(mobile)
 	if e != nil {
 		err = errors.New("GetWxOpenIdByMobileList, Err: " + e.Error())
 		return
 	}
+	if len(openIdList) == 0 {
+		return
+	}
 	openIdArr := make([]string, 0)
 	for _, v := range openIdList {
 		openIdArr = append(openIdArr, v.OpenId)
 	}
-
-	redirectUrl = utils.WX_MSG_PATH_YX_COMMENT_DETAIL + strconv.Itoa(msgId) + "&type=文章"
+	redirectUrl = utils.WX_MSG_PATH_TEMPLATE_MSG + "SourceId=" + strconv.Itoa(msgId) + "&SourceType=1"
+	//redirectUrl = utils.WX_MSG_PATH_YX_COMMENT_DETAIL + strconv.Itoa(msgId) + "&type=文章"  // 子文老表定义的错误地址，等前端来，再联调看看
 	sendInfo := new(SendWxCategoryTemplate)
 	sendInfo.Keywords = keywords
 	sendInfo.TemplateId = utils.WxCategoryMsgTemplateIdApplyXzs

utils/config.go

@@ -50,14 +50,19 @@ var (
 	YiDongHuaWeiYunUrl       string //易董 华为云请求域名
 	YiDonggetOriginalLink    string //易董 短连接转为长链接
 
+	//权益内容组手机号
+	RAI_MOBILE_GAO_YI_WEN    string // 权益高亦文手机号
+	RAI_MOBILE_DONG_HENG     string // 权益董衡手机号
+	RAI_MOBILE_WU_ANG_DI_WEN string // 权益吴昂迪手机号
+	RAI_MOBILE_GE_LIN_WEN    string // 权益葛琳手机号
+
 )
 
 // 模板消息推送
 var (
-	SendWxTemplateMsgUrl string
+	SendWxTemplateMsgUrl         string
 	SendWxCategoryTemplateMsgUrl string
 
-
 	// 类目模板
 	WxCategoryMsgTemplateIdApplyXzs                  string //申请待处理（买方研选）
 	WxCategoryMsgTemplateIdActivitySign              string //买方研选活动签到通知-类目模板ID（买方研选）
@@ -132,6 +137,13 @@ func init() {
 		WxCategoryMsgTemplateIdActivitySign = "11rITVC5Gl8qwetxl92NqY887Uk14kg3nPtEA_i_zLo"
 		WxMsgCategoryTemplateIdCompanyApprovalMessageRai = "t1CcxcOkoZkWZrDRs6zYUlceBGYMV3mhkBYUa8a6Mx0" //权益销售签约成功通知买方研选类目模版消息通知-类目模板ID
 		WxMsgCategoryTemplateIdActivityPublishApply = "IBMqiE61lVgUfFM4rsH0XCH57R_G3PbWvRbnzg9JHPI"
+
+		//权益内容组手机号
+		RAI_MOBILE_GAO_YI_WEN = "15000123056"    //权益高亦文手机号
+		RAI_MOBILE_DONG_HENG = "15216736473"     // 权益董衡手机号
+		RAI_MOBILE_WU_ANG_DI_WEN = "18701809782" // 权益吴昂迪手机号
+		RAI_MOBILE_GE_LIN_WEN = "18258485832"    // 权益葛琳手机号
+
 	} else {
 		WxPublicAppId = "wx9b5d7291e581233a"                                          //弘则投研公众号 开发者ID(AppID)
 		WxPublicAppSecret = "f4d52e34021eee262dce9682b31f8861"                        //弘则投研公众号秘钥
@@ -152,12 +164,17 @@ func init() {
 		SendWxCategoryTemplateMsgUrl = "http://127.0.0.1:8086/v1/wechat/send_category_template_msg"
 		//SendWxCategoryTemplateMsgUrl = "http://8.136.199.33:8086/v1/wechat/send_category_template_msg"
 
-
 		// 类目模版
 		WxCategoryMsgTemplateIdApplyXzs = "IemWOTzbnLBqJ2ozSiFqm13WjaotoC3V4uXaxTij08I"
 		WxCategoryMsgTemplateIdActivitySign = "aczgUYZASO97UJiCD_nDmD1eNWZAWudzw3JYcvjJ2x4"
 		WxMsgCategoryTemplateIdCompanyApprovalMessageRai = "wU4x_c5XruwuA44VZelyklRNOfq4XrU9ILckTtDs6hg" //权益销售签约成功通知买方研选类目模版消息通知-类目模板ID
 		WxMsgCategoryTemplateIdActivityPublishApply = "wLeV7tVK4ZJBoAvsmfXkHveVW8yefGAkwnVKQWRi8uQ"
+
+		//权益内容组手机号测试环境没什么用，配合测试切换他们的手机号
+		RAI_MOBILE_GAO_YI_WEN = "17706316791"    //权益高亦文手机号
+		RAI_MOBILE_DONG_HENG = "15557270714"     // 权益董衡手机号
+		RAI_MOBILE_WU_ANG_DI_WEN = "15557270714" // 权益吴昂迪手机号
+		RAI_MOBILE_GE_LIN_WEN = "15557270714"    // 权益葛琳手机号
 	}
 	HeadimgurlDefault = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202202/20220225/XFBBOUmDC5AXkfxnHiuqKpPtoofH.png"