Merge branch 'yx_1.1' into debug

controllers/cygx/activity_signup.go

@@ -2482,6 +2482,9 @@ func (this *ActivitySignupCoAntroller) SignupCancel() {
 		return
 	}
 	go cygxService.YanXuanActivityPointsBillSignupCancel(detail.ActivityId, detail.UserId, adminInfo.AdminId)
+	if activityInfo.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN{
+		go services.SendWxCategoryMsgWithYxActivityCancelSignUpBySell(detail.UserId, activityInfo.ActivityId)
+	}
 	//添加操作日志记录
 	br.IsAddLog = true
 	br.Ret = 200

services/wechat_send_category_template_msg.go

@@ -497,7 +497,7 @@ func SendWxCategoryMsgWithCygxActivitySignUpBySell(items []*cygx.CygxSignupUser)
 		if activityInfo == nil {
 			return
 		}
-		wxUser, e := models.GetWxUserByUserId(uid)
+		wxUser, e := models.GetWxUserItemByUserId(uid)
 		if e != nil {
 			err = errors.New("查询用户信息失败, Err: " + e.Error())
 			return
@@ -513,6 +513,12 @@ func SendWxCategoryMsgWithCygxActivitySignUpBySell(items []*cygx.CygxSignupUser)
 		//condition += ` AND u.mobile IN (` + utils.GetOrmInReplace(mobileLen) + `)`
 		//pars = append(pars, mobileArr)
 
+		sellerItem, e := cygx.GetSellerByCompanyIdCheckFicc(wxUser.CompanyId, 2)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			err = errors.New("GetSellerByCompanyIdCheckFicc, Err: " + e.Error())
+			return
+		}
+
 		openIdList, e := cygx.GetUserRecordListByMobileArr(mobileArr)
 		if e != nil {
 			err = errors.New("GetWxOpenIdBList, Err: " + e.Error())
@@ -527,15 +533,16 @@ func SendWxCategoryMsgWithCygxActivitySignUpBySell(items []*cygx.CygxSignupUser)
 			openIdArr[i] = v.OpenId
 		}
 		resultTime := utils.StrTimeToTime(activityInfo.ActivityTime)
-		keyword1 := "销售已为您报名:"
-		keyword2 := "报名成功"
-		keyword3 := activityInfo.ActivityName
+		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}
-		sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityPublishApply
-		sendInfo.RedirectUrl = utils.WX_MSG_PATH_ACTIVITY_DETAIL + strconv.Itoa(activityId)
+		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
@@ -686,4 +693,79 @@ func SendWxCategoryMsgSpecialFollow(specialId int) (err error) {
 		return
 	}
 	return
-}
+}
+
+// 销售或后台管理员给用户取消报名之后，进行模版消息推送-研选类目模版
+func SendWxCategoryMsgWithYxActivityCancelSignUpBySell(uid, activityId int) (err error) {
+	var msg string
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go alarm_msg.SendAlarmMsg("修改活动人数限制之后，对于因为人数已满而失败的用户，推送模板消息，发送类目模版消息失败，Err："+err.Error()+";msg:"+msg, 3)
+			utils.FileLogCygx.Info(fmt.Sprintf("发送类目模版消息失败,Err:%s,%s", err.Error(), msg))
+		}
+	}()
+
+	//var condition string
+	//var pars []interface{}
+
+	activityInfo, e := cygx.GetAddActivityInfoById(activityId)
+	if e != nil {
+		err = errors.New("活动不存在, Err: " + e.Error())
+		return
+	}
+
+	wxUser, e := models.GetWxUserItemByUserId(uid)
+	if e != nil {
+		err = errors.New("查询用户信息失败, Err: " + e.Error())
+		return
+	}
+	var mobileArr []string
+	mobileArr = append(mobileArr, wxUser.Mobile)
+	mobileLen := len(mobileArr)
+	if mobileLen == 0 {
+		return
+	}
+	//condition = ""
+	//pars = make([]interface{}, 0)
+	//condition += ` AND u.mobile IN (` + utils.GetOrmInReplace(mobileLen) + `)`
+	//pars = append(pars, mobileArr)
+	sellerItem, e := cygx.GetSellerByCompanyIdCheckFicc(wxUser.CompanyId, 2)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetSellerByCompanyIdCheckFicc, Err: " + e.Error())
+		return
+	}
+	openIdList, e := cygx.GetUserRecordListByMobileArr(mobileArr)
+	if e != nil {
+		err = errors.New("GetWxOpenIdBList, Err: " + e.Error())
+		return
+	}
+	if len(openIdList) == 0 {
+		return
+	}
+	openIdArr := make([]string, len(openIdList))
+	for i, v := range openIdList {
+		fmt.Println(v.OpenId)
+		openIdArr[i] = v.OpenId
+	}
+	resultTime := utils.StrTimeToTime(activityInfo.ActivityTime)
+	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
+	}
+	return
+}

utils/config.go

@@ -69,6 +69,7 @@ var (
 	WxMsgCategoryTemplateIdActivityCancleApply       string //买方研选活动取消通知-类目模板ID
 	WxMsgCategoryTemplateIdActivityPublishApply      string //买方研选关注的产业下，单个活动/研选报告发布通知-类目模板ID
 	WxMsgCategoryTemplateIdCompanyApprovalMessageRai string //权益销售签约成功通知买方研选类目模版消息
+	WxMsgCategoryTemplateIdActivityApply             string //后台研选活动给客户报名或取消报名模版消息
 
 	WxMsgTemplateIdWithYbCommunityQuestion string // 研报小程序->问答社区回复通知
 	WxMsgTemplateIdWithSealApplyFinished   string // 用印申请-已签回通知
@@ -382,6 +383,7 @@ func WxDebug() {
 		WxMsgCategoryTemplateIdActivityCancleApply = "NdnEwNmqTy8LSVGJNGSAEkTdG9U17Vk7dveqwroiTLM"       //买方研选活动取消通知-类目模板ID
 		WxMsgCategoryTemplateIdActivityPublishApply = "wLeV7tVK4ZJBoAvsmfXkHveVW8yefGAkwnVKQWRi8uQ"      //买方研选活动报告发布通知-类目模板ID
 		WxMsgCategoryTemplateIdCompanyApprovalMessageRai = "wU4x_c5XruwuA44VZelyklRNOfq4XrU9ILckTtDs6hg" //权益销售签约成功通知买方研选类目模版消息通知-类目模板ID
+		WxMsgCategoryTemplateIdActivityApply = "IemWOTzbnLBqJ2ozSiFqm13WjaotoC3V4uXaxTij08I"             //后台研选活动给客户报名或取消报名模版消息
 	}
 
 	//查研观向小助手
@@ -426,6 +428,7 @@ func WxRelease() {
 		WxMsgCategoryTemplateIdActivityCancleApply = "N1oPORd3cHUJKAX6IZysZPQfemXv-ARf8iTYp0w0IvA"       //买方研选活动取消通知-类目模板ID
 		WxMsgCategoryTemplateIdActivityPublishApply = "IBMqiE61lVgUfFM4rsH0XCH57R_G3PbWvRbnzg9JHPI"      //买方研选活动报告发布通知-类目模板ID
 		WxMsgCategoryTemplateIdCompanyApprovalMessageRai = "t1CcxcOkoZkWZrDRs6zYUlceBGYMV3mhkBYUa8a6Mx0" //权益销售签约成功通知买方研选类目模版消息通知-类目模板ID
+		WxMsgCategoryTemplateIdActivityApply = "HKD03oZfSv8LJgeoHz0pynai3G2Ls4h8zZ6BfOpZmIA"             //后台研选活动给客户报名或取消报名模版消息
 
 	}