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

routers/commentsRouter.go

@@ -892,7 +892,7 @@ func init() {
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ReportController"],
         beego.ControllerComments{
             Method: "ResearchDetail",
-            Router: `/researchSummary/detail_test_del`,
+            Router: `/researchSummary/detail`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,

services/activity.go

@@ -29,6 +29,7 @@ func UpdateActivitySattus(cont context.Context) (err error) {
 
 // 推送会议开始消息提醒60分钟前
 func SendActivityBeginMsg(cont context.Context) (err error) {
+	//func SendActivityBeginMsg() (err error) {
 	defer func() {
 		if err != nil {
 			go utils.SendAlarmMsg("60分钟会议消息提醒失败", 2)
@@ -67,7 +68,7 @@ func SendActivityBeginMsg(cont context.Context) (err error) {
 		//}
 		reserveResults = "--"
 		first = "您有一场【" + v.ActivityTypeName + "】将在1小时后开始"
-		SendWxMsgWithFrequency(first, v.ActivityName, reserveResults, v.ActivityTime, v.Address, remark, openIdList, v.ActivityId)
+		SendWxMsgWithFrequency(first, v.ActivityName, reserveResults, v.ActivityTimeText, v.Address, remark, openIdList, v.ActivityId)
 	}
 	if len(signupIds) == 0 {
 		return
@@ -112,7 +113,7 @@ func SendActivityBeginMsgMeeting(cont context.Context) (err error) {
 		openIdList = append(openIdList, openIdItem)
 		reserveResults = "--"
 		first = "您有一场【" + v.ActivityTypeName + "】将在15分钟后开始"
-		SendWxMsgWithFrequency(first, v.ActivityName, reserveResults, v.ActivityTime, "--", remark, openIdList, v.ActivityId)
+		SendWxMsgWithFrequency(first, v.ActivityName, reserveResults, v.ActivityTimeText, "--", remark, openIdList, v.ActivityId)
 	}
 	if len(signupIds) == 0 {
 		return

services/user.go

@@ -17,7 +17,7 @@ import (
 var ERR_NO_USER_RECORD = errors.New("用户关系没有入库")
 var ERR_USER_NOT_BIND = errors.New("用户没有绑定")
 
-//通过openid获取用户信息
+// 通过openid获取用户信息
 func GetWxUserItemByOpenId(openid string) (item *models.WxUserItem, err error) {
 	//通过openid获取用户关联信息
 	userRecord, userRecordErr := models.GetUserRecordByOpenId(openid)
@@ -77,7 +77,7 @@ func GetWxUserItemByOpenId(openid string) (item *models.WxUserItem, err error) {
 	return
 }
 
-//根据用户id和平台id获取用户信息
+// 根据用户id和平台id获取用户信息
 func GetWxUserItemByUserId(userId, platform int) (wxUserItem *models.WxUserItem, err error) {
 	//获取用户信息
 	wxUserItem, wxUserErr := models.GetWxUserItemByUserId(userId)
@@ -90,7 +90,7 @@ func GetWxUserItemByUserId(userId, platform int) (wxUserItem *models.WxUserItem,
 	return
 }
 
-//根据用户邮箱和平台id获取用户信息
+// 根据用户邮箱和平台id获取用户信息
 func GetWxUserItemByEmail(email string, platform int) (wxUserItem *models.WxUserItem, err error) {
 	//获取用户信息
 	wxUserItem, wxUserErr := models.GetWxUserItemByEmail(email)
@@ -104,7 +104,7 @@ func GetWxUserItemByEmail(email string, platform int) (wxUserItem *models.WxUser
 	return
 }
 
-//根据用户手机号和平台id获取用户信息
+// 根据用户手机号和平台id获取用户信息
 func GetWxUserItemByMobile(mobile string, platform int) (wxUserItem *models.WxUserItem, err error) {
 	//获取用户信息
 	wxUserItem, wxUserErr := models.GetWxUserItemByMobile(mobile)
@@ -117,7 +117,7 @@ func GetWxUserItemByMobile(mobile string, platform int) (wxUserItem *models.WxUs
 	return
 }
 
-//根据用户unionid和平台id获取用户信息
+// 根据用户unionid和平台id获取用户信息
 func GetWxUserItemByUnionId(unionId string, platform int) (wxUserItem *models.WxUserItem, err error) {
 	//获取用户信息
 	wxUserItem, wxUserErr := models.GetWxUserItemByUnionid(unionId)
@@ -130,7 +130,7 @@ func GetWxUserItemByUnionId(unionId string, platform int) (wxUserItem *models.Wx
 	return
 }
 
-//通过用户 关系表记录  和  用户记录  格式化返回 用户数据
+// 通过用户 关系表记录  和  用户记录  格式化返回 用户数据
 func formatWxUserAndUserRecord(wxUser *models.WxUserItem, userRecord *models.UserRecord) {
 	wxUser.OpenId = userRecord.OpenId
 	wxUser.UnionId = userRecord.UnionId
@@ -141,7 +141,7 @@ func formatWxUserAndUserRecord(wxUser *models.WxUserItem, userRecord *models.Use
 	wxUser.SessionKey = userRecord.SessionKey
 }
 
-//通过用户 用户记录  和  来源平台  格式化返回 用户数据
+// 通过用户 用户记录  和  来源平台  格式化返回 用户数据
 func formatWxUser(wxUser *models.WxUserItem, platform int) {
 	//根据用户id和平台id获取用户关系
 	userRecord, userRecordErr := models.GetUserRecordByUserId(wxUser.UserId, platform)
@@ -169,7 +169,7 @@ func formatWxUser(wxUser *models.WxUserItem, platform int) {
 	return
 }
 
-//用户绑定
+// 用户绑定
 func BindWxUser(openid, mobile, email, countryCode string) (wxUser *models.WxUserItem, err error) {
 	if mobile == "" && email == "" {
 		err = errors.New("手机号或邮箱必填一个")
@@ -268,7 +268,7 @@ func BindWxUser(openid, mobile, email, countryCode string) (wxUser *models.WxUse
 	return
 }
 
-//微信登录
+// 微信登录
 func WxLogin(code, openId, unionId string, wxUserInfo *WxUserInfo) (token string, userId, firstLogin, permission int, err error) {
 	if unionId == "" {
 		unionId = wxUserInfo.Unionid
@@ -374,7 +374,7 @@ func UserLogin() {
 
 }
 
-//添加第三方用户（微信）记录
+// 添加第三方用户（微信）记录
 func AddUserRecord(openId, unionId, nickName, realName, province, city, country, headimgurl, sessionKey string, platform, sex, subscribe int) (userRecord *models.UserRecord, err error) {
 	find, err := models.GetUserRecordByOpenId(openId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -407,7 +407,7 @@ func AddUserRecord(openId, unionId, nickName, realName, province, city, country,
 	return
 }
 
-//每天新增，删除的白名单
+// 每天新增，删除的白名单
 func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	var msg string
 	var fieldStr string
@@ -757,7 +757,7 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	return
 }
 
-//获取用户权限
+// 获取用户权限
 func GetUserhasPermission(user *models.WxUserItem) (hasPermission int, err error) {
 	//判断是否已经申请过
 	applyCount, err := models.GetApplyRecordCount(user.UserId)
@@ -783,7 +783,7 @@ func GetUserhasPermission(user *models.WxUserItem) (hasPermission int, err error
 				hasPermission = 4
 			}
 		} else {
-			if strings.Contains(companyPermission, "医药") || strings.Contains(companyPermission, "科技") || strings.Contains(companyPermission, "消费") || strings.Contains(companyPermission, "智造") {
+			if strings.Contains(companyPermission, "医药") || strings.Contains(companyPermission, "科技") || strings.Contains(companyPermission, "消费") || strings.Contains(companyPermission, "智造") || strings.Contains(companyPermission, "策略") {
 				hasPermission = 1
 			}
 		}
@@ -791,7 +791,7 @@ func GetUserhasPermission(user *models.WxUserItem) (hasPermission int, err error
 	return
 }
 
-//每周五发送当前所有的权益用户
+// 每周五发送当前所有的权益用户
 func SendEmailAllUserWithRAI() (err error) {
 	defer func() {
 		if err != nil {
@@ -897,7 +897,7 @@ func SendEmailAllUserWithRAI() (err error) {
 	return
 }
 
-//每周五发送发送这些公司下的用户
+// 每周五发送发送这些公司下的用户
 func SendEmailAllUserWithCompany() (err error) {
 	defer func() {
 		if err != nil {

services/wx_template_msg.go

@@ -39,13 +39,10 @@ func SendWxMsgWithFrequency(first, activityName, reserveResults, activityTime, a
 	sendMap := make(map[string]interface{})
 	sendData := make(map[string]interface{})
 	sendMap["template_id"] = templateId
-	sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId, "pagepath": "activityPages/activityDetail/activityDetail?id=" + strconv.Itoa(activityId)}
-	//sendMap["miniprogram"] = map[string]interface{}{"appid": "wx4a844c734d8c8e56", "path": "pages/index/index"}
+	sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId, "pagepath": utils.WX_MSG_PATH_ACTIVITY_DETAIL + strconv.Itoa(activityId)}
 	sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
-	sendData["activity_name"] = map[string]interface{}{"value": activityName, "color": "#173177"}
-	sendData["reserve_results"] = map[string]interface{}{"value": reserveResults, "color": "#173177"}
-	sendData["activity_time"] = map[string]interface{}{"value": activityTime, "color": "#173177"}
-	sendData["activity_address"] = map[string]interface{}{"value": activityAddress, "color": "#173177"}
+	sendData["keyword1"] = map[string]interface{}{"value": activityName, "color": "#173177"}
+	sendData["keyword2"] = map[string]interface{}{"value": activityTime, "color": "#173177"}
 	sendData["remark"] = map[string]interface{}{"value": remark, "color": "#173177"}
 	sendMap["data"] = sendData
 	WxSendTemplateMsg(sendUrl, sendMap, openIdList, strconv.Itoa(activityId), utils.TEMPLATE_MSG_CYGX_ACTIVITY_ADD)
@@ -78,10 +75,12 @@ func SendWxMsgWithFrequencySpecial(first, activityName, reserveResults, activity
 	sendMap["template_id"] = templateId
 	sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId, "pagepath": utils.WX_MSG_PATH_ACTIVITY_SPECIAL_DETAIL + strconv.Itoa(activityId)}
 	sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
-	sendData["activity_name"] = map[string]interface{}{"value": activityName, "color": "#173177"}
-	sendData["reserve_results"] = map[string]interface{}{"value": reserveResults, "color": "#173177"}
-	sendData["activity_time"] = map[string]interface{}{"value": activityTime, "color": "#173177"}
-	sendData["activity_address"] = map[string]interface{}{"value": activityAddress, "color": "#173177"}
+	sendData["keyword1"] = map[string]interface{}{"value": activityName, "color": "#173177"}
+	sendData["keyword2"] = map[string]interface{}{"value": activityTime, "color": "#173177"}
+	//sendData["activity_name"] = map[string]interface{}{"value": activityName, "color": "#173177"}
+	//sendData["reserve_results"] = map[string]interface{}{"value": reserveResults, "color": "#173177"}
+	//sendData["activity_time"] = map[string]interface{}{"value": activityTime, "color": "#173177"}
+	//sendData["activity_address"] = map[string]interface{}{"value": activityAddress, "color": "#173177"}
 	sendData["remark"] = map[string]interface{}{"value": remark, "color": "#173177"}
 	sendMap["data"] = sendData
 	WxSendTemplateMsg(sendUrl, sendMap, openIdList, strconv.Itoa(activityId), utils.TEMPLATE_MSG_CYGX_ACTIVITY_ADD)

utils/config.go

@@ -221,7 +221,7 @@ func init() {
 		//原有的模板ID
 		WxPublicIdXzs = "wx9b5d7291e581233a"                                            //查研观向小助手
 		WxPublicSecretXzs = "f4d52e34021eee262dce9682b31f8861"                          //查研观向小助手
-		WxMsgTemplateIdActivityApplyXzs = "Y59n_AHg-RLCKaz293geW76KDHpGL1qOnE7eF_lxelY" //活动预约消息提醒（小助手）
+		WxMsgTemplateIdActivityApplyXzs = "U3su--7d6xsCDcP6Tya0N0wWpKn_uI0zO1cutRK52cc" //活动预约消息提醒（小助手）
 		WxMsgTemplateIdAskMsgXzs = "qfNuops-sKrfIkbA7U97A7gSrX03mUpoEpJksRUdloo"        //手机号用户【XXX】发送模板消息模板ID(小助手)
 		WxMsgTemplateIdApplyXzs = "qfNuops-sKrfIkbA7U97A7gSrX03mUpoEpJksRUdloo"         //申请待处理（小助手）
 		WxMsgTemplateIdApplyCancelXzs = "UU_d7ks0XZBnWg2xFzxL9Heilm4kisX39K7dr4SDdO8"   ////预约取消提醒(小助手)
@@ -230,7 +230,7 @@ func init() {
 		//新的模板ID
 		WxPublicIdXzs = "wxb7cb8a15abad5b8e"                                            //查研观向小助手
 		WxPublicSecretXzs = "f425ba2863084249722af1e2a5cfffd3"                          //查研观向小助手
-		WxMsgTemplateIdActivityApplyXzs = "nsfOASdg2O5KNk8hnBvu8MFsoP9X0o8ED6yPLPvEkao" //活动预约消息提醒（小助手）
+		WxMsgTemplateIdActivityApplyXzs = "mItHdTF6swcunM4P36lOjnLknGbHaLqYdbOsRKscBq4" //活动预约消息提醒（小助手）
 		WxMsgTemplateIdAskMsgXzs = "IpS-yuNNQc8osCoy20jPHNkvBUyKRL1NGn7c0G9xmQA"        //手机号用户【XXX】发送模板消息模板ID(小助手)
 		WxMsgTemplateIdApplyXzs = "IpS-yuNNQc8osCoy20jPHNkvBUyKRL1NGn7c0G9xmQA"         //申请待处理（小助手）
 		WxMsgTemplateIdApplyCancelXzs = "gCSCAWNNhjkzE2V1cjbIV_Ex68R_8LM_u25qDlSKWyM"   ////预约取消提醒(小助手)