no message

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

@@ -1577,8 +1577,8 @@ func ArticleUserRemind(user *models.WxUserItem, articleDetail *models.ArticleDet
 		var keyword1 string
 		var keyword2 string
 
-		keyword1 = fmt.Sprint(user.RealName, "--", user.CompanyName, ",有新的互动：", sourceMsg)
-		keyword2 = articleDetail.Title
+		keyword1 = articleDetail.Title
+		keyword2 = fmt.Sprint("互动：", sourceMsg, ",", user.RealName, "--", user.CompanyName)
 		SendWxMsgWithArticleUserRemind(keyword1, keyword2, openIdList, articleDetail.ArticleId)
 	}
 	return
@@ -1623,8 +1623,8 @@ func ActivityUserRemind(user *models.WxUserItem, activityDetail *models.Activity
 		}
 		var keyword1 string
 		var keyword2 string
-		keyword1 = fmt.Sprint(user.RealName, "--", user.CompanyName, ",有新的互动：", sourceMsg)
-		keyword2 = activityDetail.ActivityName
+		keyword1 = activityDetail.ActivityName
+		keyword2 = fmt.Sprint("互动：", sourceMsg, ",", user.RealName, "--", user.CompanyName)
 		SendWxMsgWithActivityUserRemind(keyword1, keyword2, openIdList, activityDetail.ActivityId)
 	}
 	return
@@ -2002,6 +2002,7 @@ func ActivityVideoUserRmind(user *models.WxUserItem, activityId, fileType int) (
 				return
 			}
 			keyword1 = activityInfo.VideoName
+			keyword2 = fmt.Sprint("互动：播放视频,", user.RealName, "--", user.CompanyName)
 			first = fmt.Sprint(user.RealName, "--", user.CompanyName, ",有新的互动：播放视频")
 		} else {
 			activityInfo, e := models.GetCygxActivityVoiceByActivityId(activityId)
@@ -2013,6 +2014,7 @@ func ActivityVideoUserRmind(user *models.WxUserItem, activityId, fileType int) (
 				return
 			}
 			keyword1 = activityInfo.VoiceName
+			keyword2 = fmt.Sprint("互动：播放音频,", user.RealName, "--", user.CompanyName)
 			first = fmt.Sprint(user.RealName, "--", user.CompanyName, ",有新的互动：播放音频")
 		}
 

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/activity_special_trip.go

@@ -178,12 +178,13 @@ func ActivitySpecialUserRmind(user *models.WxUserItem, activityId, TripStatus in
 		}
 		//TripStatus            int    `description:"行程进行状态 1：预报名，2：确定行程"`
 		if TripStatus == 1 {
-			first = fmt.Sprint(user.RealName, "--", user.CompanyName, ",有新的互动：专项调研预报名")
+			keyword2 = fmt.Sprint("互动：专项调研预报名,", user.RealName, "--", user.CompanyName)
 		} else {
-			first = fmt.Sprint(user.RealName, "--", user.CompanyName, ",有新的互动：活动报名")
+			keyword2 = fmt.Sprint("互动：活动报名,", user.RealName, "--", user.CompanyName)
+
 		}
 		keyword1 = activityInfo.ResearchTheme
-		keyword2 = "__"
+		//keyword2 = "__"
 		remark = "点击查看活动详情"
 		openIdArr := make([]string, 0)
 		for _, v := range openIdList {

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 {