Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_13.2

models/send_company_user.go

@@ -104,7 +104,7 @@ func GetSendCompanyList(condition string) (items []*CompanyJson, err error) {
 			1 = 1 
 			AND c.enabled = 1 
 			AND b.cygx_auth = 1
-			AND p.STATUS IN ( '正式', '试用','冻结','流失' )
+			AND p.STATUS IN ( '正式', '试用','冻结','流失' ,'流失', '永续' )
 			AND( c.credit_code LIKE '91%'  OR  c.credit_code LIKE 'HZ%' )
 			AND p.product_id = 2 ` + condition +
 		`GROUP BY 
@@ -197,7 +197,7 @@ func GetSendCompanyFiccList(condition string) (items []*CompanyJson, err error)
 				1 = 1 
 				AND c.enabled = 1 
 				AND b.cygx_auth = 1 
-				AND p.STATUS IN  ( '正式', '试用' ,'冻结','流失')
+				AND p.STATUS IN  ( '正式', '试用' ,'冻结','流失', '永续')
 				AND ( c.credit_code LIKE '91%' OR c.credit_code LIKE 'HZ%' ) 
 				AND p.product_id = 2
 			GROUP BY
@@ -244,7 +244,7 @@ func GetSendUserList(condition string) (items []*UserJson, err error) {
 				1 = 1 
 				AND c.enabled = 1 
 				AND b.cygx_auth = 1 
-				AND p.STATUS IN ( '正式', '试用','冻结','流失')
+				AND p.STATUS IN ( '正式', '试用','冻结','流失','流失', '永续' )
 				AND us.create_time  != '' ` + condition +
 		`GROUP BY
 				c.company_id 

services/activity.go

@@ -46,12 +46,12 @@ func SendActivityBeginMsg(cont context.Context) (err error) {
 	if len(listActivity) == 0 {
 		return
 	}
-	var remark = "点击查看活动详情"
+	//var remark = "点击查看活动详情"
 	var signupIds string
 	for _, v := range listActivity {
 		signupIds += strconv.Itoa(v.Id) + ","
-		var reserveResults string
-		var first string
+		//var reserveResults string
+		//var first string
 		openIdItem := new(models.OpenIdList)
 		openIdItem.OpenId = v.OpenId
 		openIdItem.UserId = v.UserId
@@ -66,9 +66,10 @@ func SendActivityBeginMsg(cont context.Context) (err error) {
 		//} else if v.FailType == 3 {
 		//	reserveResults = "失败（爽约次数超限）"
 		//}
-		reserveResults = "--"
-		first = "将在1小时后开始"
-		SendWxMsgWithFrequency(first, v.ActivityName, reserveResults, v.ActivityTimeText, v.Address, remark, openIdList, v.ActivityId)
+		//reserveResults = "--"
+		//first = "将在1小时后开始"
+		//SendWxMsgWithFrequency(first, v.ActivityName, reserveResults, v.ActivityTimeText, v.Address, remark, openIdList, v.ActivityId)
+		SendWxMsgWithFrequencyBycategory(v.ActivityName, v.ActivityTime, openIdList, v.ActivityId)
 	}
 	if len(signupIds) == 0 {
 		return
@@ -110,7 +111,7 @@ func SendActivityBeginMsgMeeting(cont context.Context) (err error) {
 		return
 	}
 	//var signupIds string
-	var remark = "点击查看活动详情"
+	//var remark = "点击查看活动详情"
 
 	var activityIds []int
 	//同一时间举办的活动不多所以这里循环查询
@@ -155,11 +156,12 @@ func SendActivityBeginMsgMeeting(cont context.Context) (err error) {
 			openIdItem.UserId = vOpenid.UserId
 			openIdList = append(openIdList, openIdItem)
 		}
-		var reserveResults string
-		var keyword2 string
-		reserveResults = "--"
-		keyword2 = "将在15分钟后开始"
-		SendWxMsgWithFrequency(keyword2, v.ActivityName, reserveResults, v.ActivityTimeText, "--", remark, openIdList, v.ActivityId)
+		//var reserveResults string
+		//var keyword2 string
+		//reserveResults = "--"
+		//keyword2 = "将在15分钟后开始"
+		//SendWxMsgWithFrequency(keyword2, v.ActivityName, reserveResults, v.ActivityTimeText, "--", remark, openIdList, v.ActivityId)
+		SendWxMsgWithFrequencyBycategory(v.ActivityName, v.ActivityTime, openIdList, v.ActivityId)
 	}
 	err = models.UpdateSendedMsgMeetingSendWxMsg(activityIds)
 	return

services/send_company_user.go

@@ -267,6 +267,9 @@ func DotongbuShangHaApi(condition string) (err error) {
 		//url = "https://crm.hzinsights.com/openapi/v1/Customer/batchSyncFiccCustomer?access_token=" + accessToken
 		url = utils.ShangHaiCrmApiLink + "openapi/v1/Customer/batchSyncFiccCustomer?access_token=" + accessToken
 		for k, _ := range companyList {
+			if companyList[k].Status == "永续" {
+				companyList[k].Status = "试用"
+			}
 			companyList[k].Fe = "权益"
 			companyList[k].EndDate = strconv.Itoa(int(companyList[k].EndDateTime.Unix()))
 			//一次同步一百条

services/wx_template_msg.go

@@ -46,6 +46,43 @@ func SendWxMsgWithFrequency(keyword2, activityName, reserveResults, activityTime
 	return
 }
 
+// 活动预开始模版消息通知(类目模版消息，暂时单独推送)
+func SendWxMsgWithFrequencyBycategory(keyWord1, keyWord2 string, openIdList []*models.OpenIdList, activityId int) (err error) {
+	if len(openIdList) == 0 {
+		return
+	}
+	var msg string
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg(fmt.Sprint("活动预开始模版消息通知消息失败SendWxMsgWithFrequencyBycategory ,activityId：", activityId, msg+";Err:"+err.Error()), 2)
+			utils.FileLog.Info("发送模版消息失败,Err:%s", err.Error())
+		}
+	}()
+	accessToken, err := models.GetWxAccessTokenByXzs()
+	if err != nil {
+		msg = "GetWxAccessToken Err:" + err.Error()
+		return
+	}
+	if accessToken == "" {
+		msg = "accessToken is empty"
+		return
+	}
+	//keyword1 := keyWord2
+	//keyword1 := keyWord2
+	sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
+	templateId := utils.WxMsgTemplateIdActivityChangeApplyXzs
+	redirectUrl := utils.WX_MSG_PATH_ACTIVITY_DETAIL + strconv.Itoa(activityId)
+	sendMap := make(map[string]interface{})
+	sendData := make(map[string]interface{})
+	sendMap["template_id"] = templateId
+	sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId, "pagepath": redirectUrl}
+	sendData["thing18"] = map[string]interface{}{"value": keyWord1, "color": "#173177"}
+	sendData["time23"] = map[string]interface{}{"value": keyWord2, "color": "#173177"}
+	sendMap["data"] = sendData
+	WxSendTemplateMsg(sendUrl, sendMap, openIdList, strconv.Itoa(activityId), utils.TEMPLATE_MSG_CYGX_ACTIVITY_ADD)
+	return
+}
+
 // 专项调研活动预开始消息通知
 // func SendWxMsgWithFrequencySpecial(first, activityName, reserveResults, activityTime, activityAddress, remark string, openIdList []*models.OpenIdList, activityId int) (err error) {
 func SendWxMsgWithFrequencySpecial(first, keyword1, keyword2, keyword3, keyword4, remark string, openIdList []*models.OpenIdList, activityId int) (err error) {

utils/config.go

@@ -44,7 +44,7 @@ var (
 	TemplateIdByProductXzs                string //产品运行报告通知-模板ID(小助手)
 	WxMsgTemplateIdArticleUserRemind      string //用户阅读报告通知-模板ID
 	WxMsgTemplateIdArticleUserRemindXzs   string //用户阅读报告通知-模板ID(小助手)
-	WxMsgTemplateIdActivityChangeApplyXzs string //查研观向活动变更通知-模板ID（小助手）
+	WxMsgTemplateIdActivityChangeApplyXzs string //查研观向活动即将开始时会前60/15分钟的通知-模板ID（小助手）
 	WxMsgTemplateIdActivitySign           string //查研观向活动签到通知-模板ID（小助手）
 )
 
@@ -177,7 +177,7 @@ func init() {
 		EmailExpert = "experts@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com"                                                                    //研选行业专家邮箱
 		EmaiWhiteUserList = "tshen@hzinsights.com;cxzhang@hzinsights.com;yyli@hzinsights.com"                                                                 //白名单邮箱
 		WxMsgTemplateIdAskMsg = "PaoDanHGlt1kFw5q-4_ipJSwO3FyZpxSSNg4rwB7YCk"
-		WxMsgTemplateIdArticleUserRemind = "7qe3i4MrGxAIPhJeMgoqqw6j0A_foUB65DLSmxKe05s"
+		WxMsgTemplateIdArticleUserRemind = "fxnlsjx-gm3dAZVJf6f3w27wA7anETl42kexXLP8FDs"
 		WxMsgTemplateIdAskMsgMobile = ""
 		//ActSendMsgMobile = "15618524605"
 		ActSendMsgMobile = "18955528215" // 汪洋手机号
@@ -195,7 +195,7 @@ func init() {
 		WxMsgTemplateIdPermissionApply = "qfNuops-sKrfIkbA7U97A7gSrX03mUpoEpJksRUdloo"
 		WxMsgTemplateIdActivityApply = "Y59n_AHg-RLCKaz293geW76KDHpGL1qOnE7eF_lxelY"
 
-		WxMsgTemplateIdActivityChange = "qfNuops-CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM"
+		WxMsgTemplateIdActivityChange = "CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM"
 		WxMsgTemplateIdArticleUserRemind = "CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM"
 
 		WxPublicAppId = "wx9b5d7291e581233a"
@@ -232,7 +232,7 @@ func init() {
 		WxMsgTemplateIdApplyXzs = "qfNuops-sKrfIkbA7U97A7gSrX03mUpoEpJksRUdloo"               //申请待处理（小助手）
 		WxMsgTemplateIdApplyCancelXzs = "UU_d7ks0XZBnWg2xFzxL9Heilm4kisX39K7dr4SDdO8"         ////预约取消提醒(小助手)
 		TemplateIdByProductXzs = "-YjuPOB7Fqd-S3ilabYa6wvjDY9aXmeEfPN6DCiy-EY"                //产品运行报告通知-模板ID(小助手)
-		WxMsgTemplateIdActivityChangeApplyXzs = "CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM" //查研观向活动变更通知-模板ID（小助手）
+		WxMsgTemplateIdActivityChangeApplyXzs = "4fwzgJ-2xUiyQqNkFCPd8vsGpOnNWWE2inZO4BXjfio" //查研观向活动变更通知-模板ID（小助手）
 		WxMsgTemplateIdActivitySign = "3l5cxpqH6c9kkLe9ow7qzqd0uYEOdY3A_PB8wRWkiHk"           //查研观向活动签到通知-模板ID（小助手）
 	} else {
 		//新的模板ID
@@ -243,7 +243,7 @@ func init() {
 		WxMsgTemplateIdApplyXzs = "IpS-yuNNQc8osCoy20jPHNkvBUyKRL1NGn7c0G9xmQA"               //申请待处理（小助手）
 		WxMsgTemplateIdApplyCancelXzs = "gCSCAWNNhjkzE2V1cjbIV_Ex68R_8LM_u25qDlSKWyM"         ////预约取消提醒(小助手)
 		TemplateIdByProductXzs = "tNcCUiK_uUkuxaFF7M9NP2RwLkw8uHFjG-TDIxGUKxo"                //产品运行报告通知-模板ID(小助手)
-		WxMsgTemplateIdActivityChangeApplyXzs = "7qe3i4MrGxAIPhJeMgoqqw6j0A_foUB65DLSmxKe05s" //查研观向活动变更通知-模板ID（小助手）
+		WxMsgTemplateIdActivityChangeApplyXzs = "Q03y1p7epHx8jnz-mHTwm8O5XEfd-XnrQB01Goldmqo" //查研观向活动变更通知-模板ID（小助手）
 		WxMsgTemplateIdActivitySign = "GIcOqewJql4rQ_dvhUna2knWIVogKulaqRxtZKnWZeo"           //查研观向活动签到通知-模板ID（小助手）
 	}