浏览代码

no message

xingzai 10 月之前
父节点
当前提交
21b979e94d
共有 7 个文件被更改,包括 84 次插入40 次删除
  1. 2 0
      controllers/activity.go
  2. 4 8
      controllers/user.go
  3. 21 2
      services/user.go
  4. 54 27
      services/wechat_send_category_template_msg.go
  5. 0 1
      services/wx_template_msg.go
  6. 1 1
      utils/config.go
  7. 2 1
      utils/constants.go

+ 2 - 0
controllers/activity.go

@@ -1908,7 +1908,9 @@ func (this *ActivityController) AskAdd() {
 					services.SendActivityAskApplyTemplateMsgV2(user.RealName+"——"+user.CompanyName+"("+sellerItem.RealName+")", "提问:"+activityInfo.ActivityName, time.Now().Format(utils.FormatDateTime), req.Content, activityInfo.ActivityName, openIpItem, activityInfo, int(msgId))
 				}
 			}
+
 		}
+		go services.SendWxCategoryMsgWithAsk(user, activityInfo, content, int(msgId))
 	} else {
 		hasPermission, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermission(user)
 		if err != nil {

+ 4 - 8
controllers/user.go

@@ -636,20 +636,16 @@ func (this *UserController) ApplyTryOut() {
 	}
 	if sellerItem == nil {
 		go services.SendPermissionApplyTemplateMsgAdmin(req, mobile, applyMethod, isResearch)
-		if isResearch {
-			//如果是研选的报告走研选的类目模版消息
-			go services.SendPermissionApplyTemplateMsgAdminByYxCategory(req, mobile, applyMethod, user.CompanyId)
-		}
 	} else {
 		openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
 		if openIpItem != nil && openIpItem.OpenId != "" {
 			go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
-			//if isResearch {
-			//	//如果是研选的报告走研选的类目模版消息
-			//	go services.SendPermissionApplyCategoryTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
-			//}
 		}
 	}
+	if isResearch {
+		//如果是研选的报告走研选的类目模版消息
+		go services.SendPermissionApplyTemplateMsgAdminByYxCategory(req, user.CompanyId)
+	}
 
 	//添加成功后,设置5分钟缓存,不允许重复添加
 	//utils.Rc.SetNX(cacheKey, user.Mobile, time.Second*60)

+ 21 - 2
services/user.go

@@ -704,7 +704,7 @@ func SendPermissionApplyTemplateMsgAdmin(req models.ApplyTryReq, usermobile, app
 	}
 	openIdList, e := models.GetWxOpenIdByMobileList(cnf.ConfigValue)
 	if e != nil && e.Error() != utils.ErrNoRow() {
-		err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
+		err = errors.New("GetWxOpenIdByMobileList, Err: " + e.Error() + cnf.ConfigValue)
 		return err
 	}
 	for _, v := range openIdList {
@@ -714,13 +714,32 @@ func SendPermissionApplyTemplateMsgAdmin(req models.ApplyTryReq, usermobile, app
 }
 
 // 研选类目模板消息
-func SendPermissionApplyTemplateMsgAdminByYxCategory(req models.ApplyTryReq, usermobile, applyMethod string, companyId int) (err error) {
+func SendPermissionApplyTemplateMsgAdminByYxCategory(req models.ApplyTryReq, companyId int) (err error) {
 	defer func() {
 		if err != nil {
 			go utils.SendAlarmMsg("研选类目模板消息消息失败, SendPermissionApplyTemplateMsgAdminByYxCategoryErrMsg: "+err.Error(), 3)
 		}
 	}()
+
+	//潜在客户、未开权益,已开FICC的客户推给王芳,开通权益的客户推给对应销售
 	mobile := utils.WxMsgTemplateIdAskMsgMobilePublic
+	if companyId > 1 {
+		raiCount, e := models.GetCompanyProductCount(companyId, utils.COMPANY_PRODUCT_RAI_ID)
+		if e != nil {
+			err = errors.New("GetCompanyProductCount, Err: " + e.Error())
+			return
+		}
+		if raiCount == 0 {
+			return
+		}
+		sealldetail, e := models.GetRaiSellerByCompanyId(companyId)
+		if e != nil {
+			err = errors.New("GetRaiSellerByCompanyId, Err: " + e.Error())
+			return
+		}
+		mobile = sealldetail.Mobile
+	}
+
 	openIdList, e := models.GetMfyxWxOpenIdByMobileList(mobile)
 	if e != nil {
 		err = errors.New("GetMfyxWxOpenIdByMobileList, Err: " + e.Error())

+ 54 - 27
services/wechat_send_category_template_msg.go

@@ -268,49 +268,76 @@ func SendReviewCategoryTemplateMsgAdmin(specialId int) (err error) {
 	return
 }
 
-// 试用申请模板消息
-func SendPermissionApplyCategoryTemplateMsg(realName, companyName, mobile, applyMethod string, itemOpenid *models.OpenIdList) (err error) {
+// 发送活动提问消息提醒
+func SendWxCategoryMsgWithAsk(user *models.WxUserItem, activityInfo *models.ActivityDetail, askMsg string, askId int) (err error) {
+	if activityInfo.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN {
+		return
+	}
 	defer func() {
 		if err != nil {
-			go utils.SendAlarmMsg(fmt.Sprint("权限申请模板消息推送消息失败,SendPermissionApplyCategoryTemplateMsg 手机号", mobile, "公司:", companyName, "手机号:", mobile, ";Err:"+err.Error()), 2)
+			fmt.Println(err)
+			go utils.SendAlarmMsg(fmt.Sprint("发送活动提问消息提醒类目模版消息失败,用户名", user.RealName, "提问ID:", askId), 2)
 		}
 	}()
+
+	companyId := user.CompanyId
+	var sellerName string
+	//潜在客户、未开权益,已开FICC的客户推给王芳,开通权益的客户推给对应销售
+	mobile := utils.WxMsgTemplateIdAskMsgMobilePublic
+	if companyId > 1 {
+		raiCount, e := models.GetCompanyProductCount(companyId, utils.COMPANY_PRODUCT_RAI_ID)
+		if e != nil {
+			err = errors.New("GetCompanyProductCount, Err: " + e.Error())
+			return
+		}
+		if raiCount > 0 {
+			sealldetail, e := models.GetRaiSellerByCompanyId(companyId)
+			if e != nil {
+				err = errors.New("GetRaiSellerByCompanyId, Err: " + e.Error())
+				return
+			}
+			sellerName = sealldetail.RealName
+			mobile += "," + sealldetail.Mobile
+		}
+	}
+	mobile = "15557270714"
+	openIdList, e := models.GetMfyxWxOpenIdByMobileList(mobile)
+	if e != nil {
+		err = errors.New("GetMfyxWxOpenIdByMobileList, Err: " + e.Error())
+		return err
+	}
+	if len(openIdList) == 0 {
+		return
+	}
+
 	var keyword1 string
 	var keyword2 string
 	var keyword3 string
 	var keyword4 string
 	var keyword5 string
-	var redirectUrl string
 
-	//detail, e := models.GetCygxApplyRecordByMobile(mobile)
-	//if e != nil {
-	//	err = errors.New("GetActivitySignupNomeetingCountList" + e.Error())
-	//	return
-	//}
-	////如果是潜在客户就推送可查看详情的模版消息
-	//if utils.RunMode == "release" {
-	//	if detail.ApplyMethod == 2 {
-	//		redirectUrl = utils.WX_MSG_PATH_APPLY_DETAIL + strconv.Itoa(detail.ApplyRecordId)
-	//	}
-	//}
+	keyword1 = user.RealName
+	keyword2 = utils.TruncateActivityNameString(user.CompanyName)
+	keyword3 = sellerName
+	keyword4 = time.Now().Format(utils.FormatDateTimeMinute2)
+	keyword5 = utils.TruncateActivityNameString("活动提问:" + askMsg)
+
+	keywords := []string{keyword1, keyword2, keyword3, keyword4, keyword5}
 
 	openIdArr := make([]string, 0)
-	openIdArr = append(openIdArr, itemOpenid.OpenId)
+	for _, v := range openIdList {
+		openIdArr = append(openIdArr, v.OpenId)
+	}
+	//redirectUrl := utils.WX_MSG_PATH_YX_ACTIVITY_DETAIL + strconv.Itoa(askId)
+	redirectUrl := utils.WX_MSG_PATH_TEMPLATE_MSG + "SourceId=" + strconv.Itoa(askId) + "&SourceType=2"
+	//redirectUrl = ""
 	sendInfo := new(SendWxCategoryTemplate)
-
-	keyword1 = realName
-	keyword2 = companyName
-	keyword3 = "权限申请"
-	keyword4 = time.Now().Format(utils.FormatDateTimeMinute2)
-	keyword5 = applyMethod
-
-	sendInfo.Keywords = []string{keyword1, keyword2, keyword3, keyword4, keyword5}
+	sendInfo.Keywords = keywords
 	sendInfo.TemplateId = utils.WxCategoryMsgTemplateIdApplyXzs
-	sendInfo.RedirectUrl = redirectUrl
 	sendInfo.RedirectTarget = 4
-	sendInfo.Resource = mobile
-	sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_APPLY
+	sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD
 	sendInfo.OpenIdArr = openIdArr
+	sendInfo.RedirectUrl = redirectUrl
 	err = SendCategoryTemplateMsg(sendInfo)
 	return
 }

+ 0 - 1
services/wx_template_msg.go

@@ -380,7 +380,6 @@ func SendCommentWxTemplateMsgByYxCategory(req models.AddCygxArticleCommentReq, u
 		openIdArr = append(openIdArr, v.OpenId)
 	}
 	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

+ 1 - 1
utils/config.go

@@ -128,7 +128,7 @@ func init() {
 
 		IndexName = "cygx_article_v03_23"
 		IndexNameComprehensive = "cygx_comprehensive"
-		ActSendMsgMobile = "15618524605"
+		ActSendMsgMobile = "15557270714"
 		SendWxTemplateMsgUrl = "http://127.0.0.1:8086/v1/wechat/send_template_msg"
 		SendWxCategoryTemplateMsgUrl = "http://127.0.0.1:8086/v1/wechat/send_category_template_msg"
 

+ 2 - 1
utils/constants.go

@@ -199,7 +199,8 @@ const (
 
 // 研选公账号跳转地址
 const (
-	WX_MSG_PATH_YX_COMMENT_DETAIL = "pages-activity/generationAsk/generationAsk?id=" //研选报告留言详情
+	WX_MSG_PATH_YX_COMMENT_DETAIL  = "pages-activity/generationAsk/generationAsk?id="   //研选报告留言详情
+	WX_MSG_PATH_YX_ACTIVITY_DETAIL = "pages-activity/activityDetail/activityDetail?id=" //研选活动详情
 )
 
 // 微信模板消息推送公共接口的秘钥