Merge branch 'yx_1.1' into debug

# Conflicts:
#	utils/constants.go

services/cygx/acitvity.go

@@ -1302,12 +1302,13 @@ func DoActivityOnenIdWxTemplateMsg(activityId int) (err error) {
 
 	// 发类目模版消息
 	if activityInfo.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+		actTime,_ := time.Parse(utils.FormatDateTime,activityInfo.ActivityTime)
 		first := activityChartPermissionName
 		keyword1 := "发布了新活动"
 		keyword2 := activityInfo.ActivityName
-		keyword3 := activityInfo.ActivityTimeText
+		keyword3 := actTime.Format(utils.FormatDateTimeMinute2)
 
-		redirectUrl := utils.WX_MSG_PATH_ACTIVITY_DETAIL + strconv.Itoa(activityId)
+		redirectUrl := utils.WX_MSG_PATH_YX_ACTIVITY_DETAIL + strconv.Itoa(activityId)
 		sendInfo := new(services.SendWxCategoryTemplate)
 		sendInfo.Keywords = []string{first, keyword1, keyword2, keyword3}
 

utils/constants.go

@@ -591,3 +591,9 @@ const (
 const (
 	TelAreaCodeHome = "86" // 大陆区号
 )
+
+// 买方研选小程序 模版消息路由
+const (
+	WX_MSG_PATH_YX_ACTIVITY_DETAIL = "pages-activity/activityDetail/activityDetail?id=" //研选报告留言详情
+
+)