Merge branch 'cygx_10.9' into debug

# Conflicts:
#	services/activity.go

controllers/activity.go

@@ -1707,7 +1707,7 @@ func (this *ActivityCoAntroller) LabelMoreList() {
 // @Param   IsResearch   query   bool  true       "是否为研选"
 // @Success 200 {object} models.GetCygxActivityListRep
 // @router /listNew [get]
-func (this *ActivityNoLoginController) ActivityListNew() {
+func (this *ActivityCoAntroller) ActivityListNew() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -2210,7 +2210,7 @@ func (this *ActivityCoAntroller) CheckAsk() {
 // @Param   IsResearch   query   bool  true       "是否为研选"
 // @Success 200 {object} models.ActivityTypeListHomeResp
 // @router /labelTypeListV5 [get]
-func (this *ActivityNoLoginController) LabelTypeListV5() {
+func (this *ActivityCoAntroller) LabelTypeListV5() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br

routers/commentsRouter.go

@@ -97,6 +97,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
+        beego.ControllerComments{
+            Method: "LabelTypeListV5",
+            Router: `/labelTypeListV5`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
             Method: "LabelTypeListV6Pc",
@@ -106,6 +115,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
+        beego.ControllerComments{
+            Method: "ActivityListNew",
+            Router: `/listNew`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
             Method: "ActivityListSearch",
@@ -223,24 +241,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityNoLoginController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityNoLoginController"],
-        beego.ControllerComments{
-            Method: "LabelTypeListV5",
-            Router: `/labelTypeListV5`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityNoLoginController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityNoLoginController"],
-        beego.ControllerComments{
-            Method: "ActivityListNew",
-            Router: `/listNew`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivitySignCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivitySignCoAntroller"],
         beego.ControllerComments{
             Method: "ByHand",

services/activity.go

@@ -2145,10 +2145,12 @@ func ArticleUserRemind(user *models.WxUserItem, articleDetail *models.ArticleDet
 func ActivityUserRemind(user *models.WxUserItem, activityDetail *models.ActivityDetail, source int) (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendAlarmMsg("同步策略平台阅读数据失败", 2)
-			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "GetCeLueArticlePv ErrMsg:"+err.Error(), utils.EmailSendToUsers)
+			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "ActivityUserRemind ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
+
+	//获取销售手机号
+
 	countUser, e := models.GetUserRemind(user.UserId)
 	if e != nil {
 		err = errors.New("GetUserRemind, Err: " + e.Error())