|
|
@@ -1252,11 +1252,8 @@ func (this *ActivityCoAntroller) PublishAndCancel() {
|
|
|
go cygxService.YiDongUpdateActivityPublish(activityId)
|
|
|
}
|
|
|
go cygxService.YanXuanActivityPointsBillActivityPublishAndCancel(activityId, AdminUser.AdminId, item.PublishStatus) //活动发布以及取消发布处理研选扣点
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
|
|
|
go elastic.AddComprehensiveActivity(activityId) // 同步Es添加活动
|
|
|
->>>>>>> 5df9e1d015c7823cef235d1c282bb463bb6de00b
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "操作成功"
|
xingzai