|
@@ -1664,7 +1664,6 @@ func (this *ActivityCoAntroller) TopeChange() {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
activityId := req.ActivityId
|
|
activityId := req.ActivityId
|
|
- item := new(cygx.CygxActivity)
|
|
|
|
activityInfo, errInfo := cygx.GetAddActivityInfoById(activityId)
|
|
activityInfo, errInfo := cygx.GetAddActivityInfoById(activityId)
|
|
if activityInfo == nil {
|
|
if activityInfo == nil {
|
|
br.Msg = "操作失败"
|
|
br.Msg = "操作失败"
|
|
@@ -1687,54 +1686,17 @@ func (this *ActivityCoAntroller) TopeChange() {
|
|
br.Msg = popupMsg
|
|
br.Msg = popupMsg
|
|
return
|
|
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 {
|
|
if err != nil {
|
|
br.Msg = "操作失败"
|
|
br.Msg = "操作失败"
|
|
br.ErrMsg = "操作失败,Err:" + err.Error()
|
|
br.ErrMsg = "操作失败,Err:" + err.Error()
|
|
return
|
|
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.Ret = 200
|
|
br.Success = true
|
|
br.Success = true
|
|
br.Msg = "操作成功"
|
|
br.Msg = "操作成功"
|