Merge branch 'yx_1.1' into debug

services/wechat_send_category_template_msg.go

@@ -534,44 +534,45 @@ func SendWxCategoryMsgWithCygxActivitySignUpBySell(items []*cygx.CygxSignupUser)
 		}
 		resultTime := utils.StrTimeToTime(activityInfo.ActivityTime)
 
-		if activityInfo.ActivityTypeId == 5 {
-			// 专家线下沙龙走另一个模板
-			keyword1 := wxUser.RealName
-			keyword2 := wxUser.CompanyName
-			keyword3 := sellerItem.RealName
-			keyword4 := resultTime.Format(utils.FormatDateTimeMinute2)
-			keyword5 := utils.TruncateActivityNameString("报名："+activityInfo.ActivityName)
-
-			sendInfo := new(SendWxCategoryTemplate)
-			sendInfo.Keywords = []string{keyword1, keyword2, keyword3, keyword4, keyword5}
-			sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityApply
-			sendInfo.RedirectUrl = utils.WX_MSG_PATH_YX_ACTIVITY_DETAIL + strconv.Itoa(activityId)
-			sendInfo.RedirectTarget = 4
-			sendInfo.SendType = utils.TEMPLATE_MSG_APPLY
-			sendInfo.OpenIdArr = openIdArr
-			err = SendCategoryTemplateMsg(sendInfo)
-			if e != nil {
-				err = errors.New("SendCategoryTemplateMsg, Err: " + e.Error())
-				return
-			}
-		} else {
-			keyword1 := "销售已为您报名"
-			keyword2 := "报名成功"
-			keyword3 := utils.TruncateActivityNameString(activityInfo.ActivityName)
-			keyword4 := resultTime.Format(utils.FormatDateTimeMinute2)
-
-			sendInfo := new(SendWxCategoryTemplate)
-			sendInfo.Keywords = []string{keyword1, keyword2, keyword3, keyword4}
-			sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityPublishApply
-			sendInfo.RedirectUrl = utils.WX_MSG_PATH_YX_ACTIVITY_DETAIL + strconv.Itoa(activityId)
-			sendInfo.RedirectTarget = 4
-			sendInfo.SendType = utils.TEMPLATE_MSG_APPLY
-			sendInfo.OpenIdArr = openIdArr
-			err = SendCategoryTemplateMsg(sendInfo)
-			if e != nil {
-				err = errors.New("SendCategoryTemplateMsg, Err: " + e.Error())
-				return
-			}
+		//if activityInfo.ActivityTypeId == 5 {
+		//	// 专家线下沙龙走另一个模板
+		//	keyword1 := wxUser.RealName
+		//	keyword2 := wxUser.CompanyName
+		//	keyword3 := sellerItem.RealName
+		//	keyword4 := resultTime.Format(utils.FormatDateTimeMinute2)
+		//	keyword5 := utils.TruncateActivityNameString("报名："+activityInfo.ActivityName)
+		//
+		//	sendInfo := new(SendWxCategoryTemplate)
+		//	sendInfo.Keywords = []string{keyword1, keyword2, keyword3, keyword4, keyword5}
+		//	sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityApply
+		//	sendInfo.RedirectUrl = utils.WX_MSG_PATH_YX_ACTIVITY_DETAIL + strconv.Itoa(activityId)
+		//	sendInfo.RedirectTarget = 4
+		//	sendInfo.SendType = utils.TEMPLATE_MSG_APPLY
+		//	sendInfo.OpenIdArr = openIdArr
+		//	err = SendCategoryTemplateMsg(sendInfo)
+		//	if e != nil {
+		//		err = errors.New("SendCategoryTemplateMsg, Err: " + e.Error())
+		//		return
+		//	}
+		//} else {
+		//
+		//}
+		keyword1 := "销售已为您报名"
+		keyword2 := "报名成功"
+		keyword3 := utils.TruncateActivityNameString(activityInfo.ActivityName)
+		keyword4 := resultTime.Format(utils.FormatDateTimeMinute2)
+
+		sendInfo := new(SendWxCategoryTemplate)
+		sendInfo.Keywords = []string{keyword1, keyword2, keyword3, keyword4}
+		sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityPublishApply
+		sendInfo.RedirectUrl = utils.WX_MSG_PATH_YX_ACTIVITY_DETAIL + strconv.Itoa(activityId)
+		sendInfo.RedirectTarget = 4
+		sendInfo.SendType = utils.TEMPLATE_MSG_APPLY
+		sendInfo.OpenIdArr = openIdArr
+		err = SendCategoryTemplateMsg(sendInfo)
+		if e != nil {
+			err = errors.New("SendCategoryTemplateMsg, Err: " + e.Error())
+			return
 		}
 	}
 	return
@@ -767,7 +768,7 @@ func SendWxCategoryMsgWithYxActivityCancelSignUpBySell(uid, activityId int) (err
 	if err != nil {
 		return
 	}
-	mobileArr = append(mobileArr, sellerItem.Mobile)
+	mobileArr = append(mobileArr, sellerItem.Mobile, utils.MobileShenTao)
 	cnfNeiRongArr := strings.Split(cnfNeiRong.ConfigValue, ",")
 	for _, v := range cnfNeiRongArr {
 		mobileArr = append(mobileArr, v)

utils/constants.go

@@ -583,7 +583,7 @@ const (
 )
 
 const (
-	MobileShenTao       = "17758061174" //沈涛手机号18767183922
+	MobileShenTao       = "18767183922" //沈涛手机号18767183922
 	MobileZhangChuanXin = "15557270714" // 张传星手机号
 	MobileWangFang      = "18621268829" // 王芳手机号
 	MobileWuAngDi       = "18701809782" // 吴昂迪手机号