diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 9c150db12..faaab14a9 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -534,6 +534,10 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs) } + if storeID == 20002 { + globals.SugarLogger.Debugf("-----sku := %s", utils.Format4Output(skus, false)) + } + if err != nil || len(skus) == 0 { return err } diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 5d811afa3..b032a48b5 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -280,13 +280,6 @@ func Init() { orderman.UpdateJdsOrdersStatus(jxcontext.AdminCtx, time.Now().AddDate(0, 0, -1), time.Now()) }, 5*time.Second, 5*time.Minute) - if beego.BConfig.RunMode == model.ServerTypeFruits /*|| beego.BConfig.RunMode == model.ServerTypePet*/ { - ScheduleTimerFuncByInterval(func() { - fromData := utils.Time2Date(time.Now()) - toData := time.Now() - orderman.FixedOrderManager.AmendMissingOrders(jxcontext.AdminCtx, []int{model.VendorIDJD, model.VendorIDMTWM, model.VendorIDEBAI, model.VendorIDDD}, 0, fromData, toData, true, true) - }, 5*time.Second, 5*time.Minute) - } // 抖音更新门店商品 ,接口收费暂不使用 //if beego.BConfig.RunMode != "jxgy" { // ScheduleTimerFunc("RefreshSyncSkuList", func() { @@ -456,6 +449,14 @@ func Init() { cms.DisabledStoreWithoutVendor(jxcontext.AdminCtx, true, true) }, dailyWorkTimeList) //} + if beego.BConfig.RunMode == model.ServerTypeFruits /*|| beego.BConfig.RunMode == model.ServerTypePet*/ { + ScheduleTimerFuncByInterval(func() { + fromData := utils.Time2Date(time.Now()) + toData := time.Now() + orderman.FixedOrderManager.AmendMissingOrders(jxcontext.AdminCtx, []int{model.VendorIDJD, model.VendorIDMTWM, model.VendorIDEBAI, model.VendorIDDD}, 0, fromData, toData, true, true) + }, 5*time.Second, 5*time.Minute) + } + ScheduleTimerFunc("doDailyWork5", func() { //刷新物料订单状态 localjx.RefreshAllMatterOrderStatus(jxcontext.AdminCtx) diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index 0dd450aa6..4a1c1c8cf 100644 --- a/business/partner/purchase/mtwm/store_sku2.go +++ b/business/partner/purchase/mtwm/store_sku2.go @@ -454,7 +454,10 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } } - + if storeID == 20002 { + globals.SugarLogger.Debugf("-----foodDataList := %s", utils.Format4Output(foodDataList, false)) + globals.SugarLogger.Debugf("-----storeSku := %s", utils.Format4Output(storeSkuList, false)) + } if globals.EnableMtwmStoreWrite { if len(foodDataList) == 1 { foodDataList[0]["skus"] = string(utils.MustMarshal(foodDataList[0]["skus"])) diff --git a/controllers/cms.go b/controllers/cms.go index 492969206..ddb18a547 100644 --- a/controllers/cms.go +++ b/controllers/cms.go @@ -2,11 +2,14 @@ package controllers import ( "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/auth2/authprovider/dingding" "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" "git.rosy.net.cn/jx-callback/business/jxstore/cms" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/configindb" "git.rosy.net.cn/jx-callback/business/jxutils/datares" + "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/msghub" "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api/apimanager" @@ -310,6 +313,15 @@ func (c *CmsController) UpdateConfig() { // @router /QueryConfigs [get] func (c *CmsController) QueryConfigs() { c.callQueryConfigs(func(params *tCmsQueryConfigsParams) (retVal interface{}, errCode string, err error) { + if params.Key == "FZR" { + userBind, err := dao.GetUserBindAuthInfo(dao.GetDB(), params.Ctx.GetUserID(), 0, []string{dingding.AuthTypeStaff}, "", "", nil) + if err != nil { + return retVal, "", err + } + if len(userBind) == model.NO { + return retVal, "", nil + } + } retVal, err = cms.QueryConfigs(params.Key, params.Type, params.Keyword) return retVal, "", err })