xingzai 1 年間 前
コミット
417ba29681
3 ファイル変更23 行追加43 行削除
  1. 5 43
      controllers/cygx/activity.go
  2. 9 0
      models/cygx/activity.go
  3. 9 0
      routers/commentsRouter.go

+ 5 - 43
controllers/cygx/activity.go

@@ -1664,7 +1664,6 @@ func (this *ActivityCoAntroller) TopeChange() {
 		return
 	}
 	activityId := req.ActivityId
-	item := new(cygx.CygxActivity)
 	activityInfo, errInfo := cygx.GetAddActivityInfoById(activityId)
 	if activityInfo == nil {
 		br.Msg = "操作失败"
@@ -1687,54 +1686,17 @@ func (this *ActivityCoAntroller) TopeChange() {
 		br.Msg = popupMsg
 		return
 	}
-	//if activityInfo.ActiveState != 1 {
-	//	br.Msg = "活动已经开始,无法修改"
-	//	return
-	//}
-	if activityInfo.PublishStatus == 0 {
-		item.PublishStatus = 1
-		item.IsCancel = 0
-		go cygxService.DoActivityOnenIdWxTemplateMsg(activityId)
-		//go cygxService.UpdateResourceData(activityId, "activity", "add", time.Now().Format(utils.FormatDateTime))
-
-		cygxService.UpdateActivityResourceData(activityId) //写入首页最新  cygx_resource_data 表
-	} else {
-		item.PublishStatus = 0
-		item.IsCancel = 1
-	}
-	if activityInfo.PublishStatus == 1 {
-		go services.SendWxMsgWithCygxActivity(req.ActivityId)
-		//同步活动到最新数据表
-		//go cygxService.UpdateResourceData(req.ActivityId, "activity", "delete", "")
-		cygxService.UpdateActivityResourceData(activityId) //写入首页最新  cygx_resource_data 表
+	var topTime int
+	//如果有置顶时间就设为取消置顶,如果没有就写入当前置顶时间
+	if activityInfo.TopTime == 0 {
+		topTime = int(time.Now().Unix())
 	}
-	item.ActivityId = req.ActivityId
-	if item.PublishStatus == 1 {
-		item.AdminId = AdminUser.AdminId
-		item.AdminName = AdminUser.RealName
-		item.PublishDate = time.Now()
-
-	} else {
-		item.AdminId = activityInfo.AdminId
-		item.AdminName = activityInfo.AdminName
-		item.PublishDate = utils.StrTimeToTime(activityInfo.PublishDate)
-	}
-	err = cygx.ActivityPublishAndCancel(item)
+	err = cygx.UpdateActivityTopTime(activityId, topTime)
 	if err != nil {
 		br.Msg = "操作失败"
 		br.ErrMsg = "操作失败,Err:" + err.Error()
 		return
 	}
-	if item.PublishStatus == 1 {
-		//易董那边重新发布,重新建会
-		go cygxService.YiDongSaveRoadshowDetail(activityId)
-	} else {
-		//易董那边取消发布并删除
-		go cygxService.YiDongUpdateActivityPublish(activityId)
-	}
-	go cygxService.YanXuanActivityPointsBillActivityPublishAndCancel(activityId, AdminUser.AdminId, item.PublishStatus) //活动发布以及取消发布处理研选扣点
-
-	go elastic.AddComprehensiveActivity(activityId) // 同步Es添加活动
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"

+ 9 - 0
models/cygx/activity.go

@@ -568,6 +568,7 @@ type CygxActivityList struct {
 	IsShowSigninButton        bool   `description:"是否展示签到码按钮"`
 	SigninImg                 string `description:"签到码图片"`
 	ChartPermissionNameDeputy string `description:"副行业名称"`
+	TopTime                   int    `description:"置顶时间"`
 }
 
 type GetCygxActivityListRep struct {
@@ -705,3 +706,11 @@ type AliyunOcrTextActivityResp struct {
 type AliyunOcrTextActivityListResp struct {
 	List []*AliyunOcrTextActivityResp
 }
+
+// 更新活动置顶时间
+func UpdateActivityTopTime(activityId, topTime int) (err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := ` UPDATE cygx_activity SET  top_time=? WHERE activity_id=?`
+	_, err = o.Raw(sql, topTime, activityId).Exec()
+	return
+}

+ 9 - 0
routers/commentsRouter.go

@@ -565,6 +565,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:ActivityCoAntroller"],
+        beego.ControllerComments{
+            Method: "TopeChange",
+            Router: `/activity/tope_change`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:ActivityLossCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:ActivityLossCoAntroller"],
         beego.ControllerComments{
             Method: "CompanyList",