diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index 4c517d561..dc4204f30 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -1983,7 +1983,7 @@ func GetNewVendorPopActs(ctx *jxcontext.Context) (err error) { return err } -func RrefreshMtwmVendorAct() (err error) { +func RrefreshMtwmVendorAct(ctx *jxcontext.Context) (err error) { var ( db = dao.GetDB() actTypeMap = map[int]int{ @@ -1995,7 +1995,7 @@ func RrefreshMtwmVendorAct() (err error) { dao.ExecuteSQL(db, `TRUNCATE act_mtwm_vendor`) storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDMTWM}, nil, []int{model.StoreStatusOpened, model.StoreStatusHaveRest, model.StoreStatusClosed}, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "") - task := tasksch.NewParallelTask("刷新美团活动", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(true), jxcontext.AdminCtx, + task := tasksch.NewParallelTask("刷新美团活动", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(true), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { storeMap := batchItemList[0].(*model.StoreMap) mtapi := mtwm.GetAPI(storeMap.VendorOrgCode, storeMap.StoreID, "") @@ -2033,7 +2033,7 @@ func RrefreshMtwmVendorAct() (err error) { return err } -func RrefreshEbaiVendorAct() (err error) { +func RrefreshEbaiVendorAct(ctx *jxcontext.Context) (err error) { var ( db = dao.GetDB() actMap = struct { @@ -2048,7 +2048,7 @@ func RrefreshEbaiVendorAct() (err error) { dao.ExecuteSQL(db, `TRUNCATE act_ebai_vendor_sku`) storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDEBAI}, nil, []int{model.StoreStatusOpened, model.StoreStatusHaveRest, model.StoreStatusClosed}, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "") - task := tasksch.NewParallelTask("刷新饿百活动", tasksch.NewParallelConfig().SetIsContinueWhenError(true), jxcontext.AdminCtx, + task := tasksch.NewParallelTask("刷新饿百活动", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { storeMap := batchItemList[0].(*model.StoreMap) actIDs, _ := api.EbaiAPI.ActMultiChannelQueryIDs("", utils.Str2Int64(storeMap.VendorStoreID), "2") diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index e817555c3..03ace316c 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -332,9 +332,9 @@ func Init() { }, dailyWorkTimeList) ScheduleTimerFunc("RrefreshMtwmVendorAct", func() { //刷新美团平台活动 - act.RrefreshMtwmVendorAct() + act.RrefreshMtwmVendorAct(jxcontext.AdminCtx) //刷新饿百平台活动 - act.RrefreshEbaiVendorAct() + act.RrefreshEbaiVendorAct(jxcontext.AdminCtx) }, dailyWorkTimeList2) } ScheduleTimerFunc("AutoSaleStoreSku", func() { diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index e00384033..6c8a7e60d 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1986,7 +1986,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // } // go connHandler(conn, "1e000f02000151323032313036313530303030313"+utils.Int2Str(i)+"00000033") //} - act.RrefreshMtwmVendorAct() + act.RrefreshMtwmVendorAct(jxcontext.AdminCtx) return err } diff --git a/controllers/act.go b/controllers/act.go index ac0b6815d..81edf0cb4 100644 --- a/controllers/act.go +++ b/controllers/act.go @@ -527,3 +527,21 @@ func (c *ActController) GetActEbaiVendorSku() { return retVal, "", err }) } + +// @Title 刷新平台活动 +// @Description 刷新平台活动 +// @Param token header string true "认证token" +// @Param vendorID query int true "平台ID" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /RefreshVendorAct [post] +func (c *ActController) RefreshVendorAct() { + c.callRefreshVendorAct(func(params *tActRefreshVendorActParams) (retVal interface{}, errCode string, err error) { + if params.VendorID == model.VendorIDMTWM { + act.RrefreshMtwmVendorAct(params.Ctx) + } else { + act.RrefreshEbaiVendorAct(params.Ctx) + } + return retVal, "", err + }) +} diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 479158b8a..b1a48fdfe 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -88,6 +88,51 @@ func init() { Filters: nil, Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"], + web.ControllerComments{ + Method: "GetActMtwmVendor", + Router: `/GetActMtwmVendor`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"], + web.ControllerComments{ + Method: "GetActMtwmVendorSku", + Router: `/GetActMtwmVendorSku`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"], + web.ControllerComments{ + Method: "GetActEbaiVendor", + Router: `/GetActEbaiVendor`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"], + web.ControllerComments{ + Method: "GetActEbaiVendorSku", + Router: `/GetActEbaiVendorSku`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"], + web.ControllerComments{ + Method: "RefreshVendorAct", + Router: `/RefreshVendorAct`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ActController"], web.ControllerComments{ Method: "GetVendorPopActs",