Merge branch 'cygx_10.9' into debug

controllers/activity.go

@@ -1021,7 +1021,7 @@ func (this *ActivityCoAntroller) SignupCancel() {
 			err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
 			return
 		}
-		keyword1 := user.RealName + "--" + user.CompanyName + "+" + sellerItemQy.RealName
+		keyword1 := user.RealName + "--" + user.CompanyName + "（" + sellerItemQy.RealName +"）"
 		keyword2 := user.Mobile
 		keyword3 := time.Now().Format(utils.FormatDateTime)
 		keyword4 := "取消报名" + activityInfo.ActivityName

services/activity.go

@@ -2208,7 +2208,7 @@ func ActivityUserRemind(user *models.WxUserItem, activityDetail *models.Activity
 			err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
 			return err
 		}
-		keyword1 := user.RealName + "--" + user.CompanyName + "+" + sellerItemQy.RealName
+		keyword1 := user.RealName + "--" + user.CompanyName + "（" + sellerItemQy.RealName +"）"
 		keyword2 := user.Mobile
 		keyword3 := time.Now().Format(utils.FormatDateTime)
 		keyword4 := "报名" + activityDetail.ActivityName