Explorar o código

Merge branch 'debug' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

xingzai hai 11 meses
pai
achega
c361eb926d

+ 1 - 0
controllers/activity_sign.go

@@ -139,6 +139,7 @@ func (this *ActivitySignCoAntroller) Detail() {
 
 
 		//线下调研活动扫码签到给对应销售发模版消息
 		//线下调研活动扫码签到给对应销售发模版消息
 		services.SendActivitieSignTemplateMsg(user, activityInfo)
 		services.SendActivitieSignTemplateMsg(user, activityInfo)
+		services.SendActivitieSignCategoryTemplateMsg(user, activityInfo)
 
 
 		//处理用户标签
 		//处理用户标签
 		services.ActivityUserLabelLogAdd(activityId, []string{user.Mobile})
 		services.ActivityUserLabelLogAdd(activityId, []string{user.Mobile})

+ 59 - 1
services/wx_category_template_msg.go

@@ -125,7 +125,7 @@ func SendMfyxEmailFileForAskMsgResearch(cont context.Context) (err error) {
 				openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
 				openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
 				openIdList := make([]*models.OpenIdList,0)
 				openIdList := make([]*models.OpenIdList,0)
 				openIdList = append(openIdList, openIpItem)
 				openIdList = append(openIdList, openIpItem)
-				SendWxCategoryMsgWithActivityAsk(user.CompanyName, user.RealName, sellerItem.RealName, time.Now().Format(utils.FormatDateTimeMinute2), v2.Content, openIdList, v2.AskId)
+				SendWxCategoryMsgWithActivityAsk(user.CompanyName, user.RealName, sellerItem.RealName, time.Now().Format(utils.FormatDateTimeMinute2), v2.Content, openIdList, v.ActivityId)
 			}
 			}
 		}
 		}
 		errFile = models.UPdateActivityMsgToSendFile(v.ActivityId)
 		errFile = models.UPdateActivityMsgToSendFile(v.ActivityId)
@@ -339,3 +339,61 @@ func SendMfyxActivityBeginMsgMeeting(cont context.Context) (err error) {
 }
 }
 
 
 
 
+
+// 线下调研活动扫码签到给对应销售发类目模班消息
+func SendActivitieSignCategoryTemplateMsg(user *models.WxUserItem, activityDetail *models.ActivityDetail) (err error) {
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg(fmt.Sprint("线下调研活动扫码签到给对应销售发模班消息推送失败Err:", err.Error(), "活动ID:", activityDetail.ActivityId, "手机号:", user.Mobile), 2)
+		}
+	}()
+	var mobiles []string
+	//获取销售信息
+	sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		return
+	}
+	if sellerItem != nil {
+		mobiles = append(mobiles, sellerItem.Mobile, utils.MobileWuAngDi, utils.MobileDongHeng, utils.MobileShenTao)
+	}
+
+	var keyword1 string
+	var keyword2 string
+	var keyword3 string
+	var keyword4 string
+	var keyword5 string
+
+	var redirectUrl string
+
+	keyword1 = user.RealName
+	keyword2 = user.CompanyName
+	keyword3 = sellerItem.RealName
+	keyword4 = activityDetail.ActivityName
+	keyword5 = time.Now().Format(utils.FormatDateTimeMinute2)
+
+	openIdList, e := models.GetWxOpenIdByMobileSliceList(mobiles)
+	if e != nil {
+		err = errors.New("GetWxOpenIdByMobileList, Err: " + e.Error())
+		return
+	}
+	openIdArr := make([]string, 0)
+	for _, v := range openIdList {
+		openIdArr = append(openIdArr, v.OpenId)
+	}
+
+	redirectUrl = utils.WX_MSG_PATH_YX_SIGNUP_DETAIL + strconv.Itoa(activityDetail.ActivityId)
+
+	keywords := []string{keyword1, keyword2, keyword3, keyword4, keyword5}
+	sendInfo := new(SendWxCategoryTemplate)
+	sendInfo.Keywords = keywords
+	sendInfo.TemplateId = utils.WxCategoryMsgTemplateIdActivitySign
+	sendInfo.RedirectTarget = 4
+	sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD
+	sendInfo.OpenIdArr = openIdArr
+	sendInfo.RedirectUrl = redirectUrl
+	err = SendCategoryTemplateMsg(sendInfo)
+	if err != nil {
+		return
+	}
+	return
+}

+ 2 - 2
utils/config.go

@@ -230,8 +230,8 @@ func init() {
 
 
 		ShangHaiCrmApiLink = "http://106.15.192.100:8100/"
 		ShangHaiCrmApiLink = "http://106.15.192.100:8100/"
 		SendWxTemplateMsgUrl = "http://127.0.0.1:8086/v1/wechat/send_template_msg"
 		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"
-		SendWxCategoryTemplateMsgUrl = "http://8.136.199.33:8086/v1/wechat/send_category_template_msg"
+		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"
 	}
 	}
 
 
 	//查研观向小助手
 	//查研观向小助手

+ 1 - 0
utils/constants.go

@@ -238,6 +238,7 @@ const (
 	MobileZhangChuanXin = "15557270714" // 张传星手机号
 	MobileZhangChuanXin = "15557270714" // 张传星手机号
 	MobileWangFang      = "18621268829" // 王芳手机号
 	MobileWangFang      = "18621268829" // 王芳手机号
 	MobileWuAngDi       = "18701809782" // 吴昂迪手机号
 	MobileWuAngDi       = "18701809782" // 吴昂迪手机号
+	MobileDongHeng      = "15216736473" // 董衡手机号
 )
 )
 
 
 const (
 const (