diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index f9b49f7cd..026481958 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -185,6 +185,13 @@ func Init() { orderman.SaveJdsOrders(jxcontext.AdminCtx, time.Now().Add(-30*time.Minute), time.Now()) }, 5*time.Second, 10*time.Minute) + ScheduleTimerFunc("RefreshJdShopOrdersEarningPrice", func() { + orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, utils.Time2Str(time.Now().AddDate(0, 0, -2)), utils.Time2Str(time.Now().AddDate(0, 0, -2))) + orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, utils.Time2Str(time.Now().AddDate(0, 0, -1)), utils.Time2Str(time.Now().AddDate(0, 0, -1))) + }, []string{ + "00:30:00", + }) + ScheduleTimerFunc("auto enable remote store", func() { cms.EnableHaveRestStores(jxcontext.AdminCtx, false, true) // cms.OpenRemoteStoreByJxStatus(jxcontext.AdminCtx, nil, nil, false, false, true) @@ -201,10 +208,6 @@ func Init() { dao.UpdateActStatusByTime(dao.GetDB(), time.Now()) }, updateActStatusTimeList) ScheduleScoreStore() - ScheduleTimerFunc("RefreshJdShopOrdersEarningPrice", func() { - orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, utils.Time2Str(time.Now().AddDate(0, 0, -1)), utils.Time2Str(time.Now())) - }, updateActStatusTimeList) - //刷新京东商城订单结算价 // ScheduleCheckStoreAlert() ScheduleTimerFunc("ChangeStoreSkuSaleStatus", func() { cms.CurVendorSync.ChangeStoreSkuSaleStatus(jxcontext.AdminCtx, 0, true, true) diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go index 2c4dadfd6..6cdc41b9a 100644 --- a/business/jxstore/report/report.go +++ b/business/jxstore/report/report.go @@ -248,15 +248,6 @@ func BeginSavePriceRefer(ctx *jxcontext.Context, cityCodes, skuIDs []int, isAsyn } dao.Commit(db, txDB) case 2: - txDB, _ := dao.Begin(db) - defer func() { - if r := recover(); r != nil || err != nil { - dao.Rollback(db, txDB) - if r != nil { - panic(r) - } - } - }() if len(priceReferSnapshotList) > 0 { for _, v := range priceReferSnapshotList { result, _ := dao.GetPriceReferPrice(db, v.CityCode, v.SkuID, snapshotAt) @@ -269,7 +260,6 @@ func BeginSavePriceRefer(ctx *jxcontext.Context, cityCodes, skuIDs []int, isAsyn } } } - dao.Commit(db, txDB) //TODO 京东查询接口报错,暂时屏蔽了 // case 3: // priceReferSnapshotList, err = dao.GetPriceReferSnapshotNoPage(db, []int{0}, nil, nil, snapshotAt)