Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_need_wx_msg_5.9

controllers/activity_sign.go

@@ -122,7 +122,7 @@ func (this *ActivitySignCoAntroller) Detail() {
 		services.AddCygxActivitySigninLog(item)
 
 		//把报名信息写入签到到会表
-		services.AddCygxActivityOfflineMeetingDetail(activityId, user)
+		services.AddCygxActivityOfflineMeetingDetail(activityId, user.UserId)
 
 		//后期扫码签到，处理是否爽约限制
 		services.CygxActivityRestrictSignupByuid(user.UserId, activityId)

services/activity.go

@@ -2002,6 +2002,8 @@ func ActivityVideoUserRmind(user *models.WxUserItem, activityId, fileType int) (
 			}
 			keyword1 = activityInfo.VideoName
 			keyword2 = fmt.Sprint("互动：播放视频,", user.RealName, "--", user.CompanyName)
+			first = fmt.Sprint(user.RealName, "--", user.CompanyName, ",有新的互动：播放视频")
+
 		} else {
 			activityInfo, e := models.GetCygxActivityVoiceByActivityId(activityId)
 			if e != nil {
@@ -2012,7 +2014,8 @@ func ActivityVideoUserRmind(user *models.WxUserItem, activityId, fileType int) (
 				return
 			}
 			keyword1 = activityInfo.VoiceName
-			keyword2 = fmt.Sprint("互动：播放音频", user.RealName, "--", user.CompanyName)
+			keyword2 = fmt.Sprint("互动：播放音频,", user.RealName, "--", user.CompanyName)
+			first = fmt.Sprint(user.RealName, "--", user.CompanyName, ",有新的互动：播放音频")
 		}
 
 		//keyword2 = "__"

services/activity_signin.go

@@ -42,7 +42,7 @@ func AddCygxActivitySigninLog(item *models.CygxActivitySignin) (err error) {
 }
 
 // AddCygxActivityOfflineMeetingDetail 扫码签到日志记录
-func AddCygxActivityOfflineMeetingDetail(activityid int, user *models.WxUserItem) (err error) {
+func AddCygxActivityOfflineMeetingDetail(activityid, userId int) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println(err)
@@ -83,7 +83,7 @@ func AddCygxActivityOfflineMeetingDetail(activityid int, user *models.WxUserItem
 			item.Mobile = v.Mobile
 			item.CompanyId = v.CompanyId
 			item.CompanyName = v.CompanyName
-			if user.UserId == v.UserId {
+			if userId == v.UserId {
 				item.IsMeeting = 1
 				item.SigninTime = time.Now().Format(utils.FormatDateTime)
 			}
@@ -106,7 +106,7 @@ func AddCygxActivityOfflineMeetingDetail(activityid int, user *models.WxUserItem
 	}
 
 	//修改签到时间
-	err = models.UpdateCygxActivityOfflineMeetingDetailSigninTime(activityid, user.UserId)
+	err = models.UpdateCygxActivityOfflineMeetingDetailSigninTime(activityid, userId)
 	if err != nil {
 		err = errors.New("UpdateCygxActivityOfflineMeetingDetailSigninTime, Err: " + err.Error())
 		return
@@ -150,6 +150,8 @@ func CygxActivityRestrictSignupByTask(cont context.Context) (err error) {
 			err = errors.New("UpdateCygxActivitySubmitMeetingByActivityId, Err: " + err.Error())
 			return
 		}
+		//把报名信息写入签到到会表
+		AddCygxActivityOfflineMeetingDetail(v.ActivityId, 0)
 	}
 	return
 }

services/micro_roadshow.go

@@ -705,7 +705,7 @@ func MicroRoadshowVideoUserRmind(user *models.WxUserItem, videoId int) (err erro
 		}
 		first = fmt.Sprint(user.RealName, "--", user.CompanyName, ",有新的互动：播放微路演详视频")
 		keyword1 = videoInfo.VideoName
-		keyword2 = "--"
+		keyword2 = fmt.Sprint("互动：播放微路演详视频,", user.RealName, "--", user.CompanyName)
 		remark = "点击查看微路演详情"
 		openIdArr := make([]string, 0)
 		for _, v := range openIdList {

services/page_history_record.go

@@ -35,14 +35,27 @@ func AddCygxPageHistoryRecord(user *models.WxUserItem, Ctx *context.Context) {
 		item.PageRouter = pr.PageRouter
 	}
 	if strings.Contains(item.Router, "/api/article/detail") {
-		cacheKey := fmt.Sprint("uid:", user.UserId, "_Parameter:", item.Parameter)
+		//cacheKey := fmt.Sprint("uid:", user.UserId, "_Parameter:", item.Parameter)
+		//isExist := utils.Rc.IsExist(cacheKey)
+		//if !isExist {
+		//	setNX := utils.Rc.SetNX(cacheKey, user.Mobile, time.Second*10)
+		//	if !setNX {
+		//		go utils.SendAlarmMsg("记录用户阅读文章，设置Redis Key 过期时间失败：key"+cacheKey, 3)
+		//	}
+		//	return
+		//}
+
+		sliceParameter := strings.Split(item.Parameter, "&PageRouter=")
+		cacheKey := fmt.Sprint("uid:", user.UserId, "_Parameter:", sliceParameter[0])
 		isExist := utils.Rc.IsExist(cacheKey)
-		if !isExist {
-			setNX := utils.Rc.SetNX(cacheKey, user.Mobile, time.Second*10)
+		if isExist {
+			return
+		}
+		setNX := utils.Rc.SetNX(cacheKey, user.Mobile, time.Second*10)
+		if !setNX {
 			if !setNX {
 				go utils.SendAlarmMsg("记录用户阅读文章，设置Redis Key 过期时间失败：key"+cacheKey, 3)
 			}
-			return
 		}
 	}