diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 78b0b6320..5de655855 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -343,7 +343,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo switch step { case 0: if len(deleteList) > 0 { - _, err = putils.FreeBatchStoreSkuInfo(func(batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { + _, err = putils.FreeBatchStoreSkuInfo(func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { var successList []*partner.StoreSkuInfo if successList, err = singleStoreHandler.DeleteStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList); singleStoreHandler.IsErrSkuNotExist(err) { err = nil @@ -359,10 +359,10 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo } case 1: if len(createList) > 0 { - _, err = putils.FreeBatchStoreSkuSyncInfo(func(batchedStoreSkuList []*dao.StoreSkuSyncInfo) (result interface{}, err error) { + _, err = putils.FreeBatchStoreSkuSyncInfo(func(task tasksch.ITask, batchedStoreSkuList []*dao.StoreSkuSyncInfo) (result interface{}, err error) { var successList []*dao.StoreSkuSyncInfo if successList, err = singleStoreHandler.CreateStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList); singleStoreHandler.IsErrSkuExist(err) { - if skuNameList, err2 := singleStoreHandler.GetStoreSkusFullInfo(ctx, nil, storeID, vendorStoreID, []*partner.StoreSkuInfo{ + if skuNameList, err2 := singleStoreHandler.GetStoreSkusFullInfo(ctx, task, storeID, vendorStoreID, []*partner.StoreSkuInfo{ &partner.StoreSkuInfo{ SkuID: batchedStoreSkuList[0].SkuID, }, @@ -386,7 +386,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo } case 2: if len(updateList) > 0 { - _, err = putils.FreeBatchStoreSkuSyncInfo(func(batchedStoreSkuList []*dao.StoreSkuSyncInfo) (result interface{}, err error) { + _, err = putils.FreeBatchStoreSkuSyncInfo(func(task tasksch.ITask, batchedStoreSkuList []*dao.StoreSkuSyncInfo) (result interface{}, err error) { var successList []*dao.StoreSkuSyncInfo if successList, err = singleStoreHandler.UpdateStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList); err == nil { successList = batchedStoreSkuList @@ -400,7 +400,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo case 3: for k, list := range [][]*partner.StoreSkuInfo{stockList /*, onlineList*/} { if len(list) > 0 { - _, err = putils.FreeBatchStoreSkuInfo(func(batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { + _, err = putils.FreeBatchStoreSkuInfo(func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { var successList []*partner.StoreSkuInfo if successList, err = storeSkuHandler.UpdateStoreSkusStock(ctx, storeID, vendorStoreID, batchedStoreSkuList); err == nil { successList = batchedStoreSkuList @@ -420,7 +420,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo status = model.SkuStatusDontSale } if len(statusList) > 0 { - _, err = putils.FreeBatchStoreSkuInfo(func(batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { + _, err = putils.FreeBatchStoreSkuInfo(func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { var successList []*partner.StoreSkuInfo if successList, err = storeSkuHandler.UpdateStoreSkusStatus(ctx, storeID, vendorStoreID, batchedStoreSkuList, status); err == nil { successList = batchedStoreSkuList @@ -433,7 +433,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo } case 6: if len(priceList) > 0 { - _, err = putils.FreeBatchStoreSkuInfo(func(batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { + _, err = putils.FreeBatchStoreSkuInfo(func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { var successList []*partner.StoreSkuInfo if successList, err = storeSkuHandler.UpdateStoreSkusPrice(ctx, storeID, vendorStoreID, batchedStoreSkuList); err == nil { successList = batchedStoreSkuList @@ -484,7 +484,7 @@ func PruneMissingStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, ven } case 1: if len(sku2Delete) > 0 { - _, err = putils.FreeBatchStoreSkuInfo(func(batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { + _, err = putils.FreeBatchStoreSkuInfo(func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { _, err = handler.DeleteStoreSkus(ctx, storeID, vendorStoreID, sku2Delete) return nil, err }, ctx, parentTask, sku2Delete, handler.GetStoreSkusBatchSize(partner.FuncDeleteStoreSkus), isContinueWhenError) diff --git a/business/jxstore/misc/misc2.go b/business/jxstore/misc/misc2.go index d7da6c7a8..2b4a47a44 100644 --- a/business/jxstore/misc/misc2.go +++ b/business/jxstore/misc/misc2.go @@ -2,41 +2,42 @@ package misc import ( "time" + + "git.rosy.net.cn/baseapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxstore/cms" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" + "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner/putils" - "git.rosy.net.cn/baseapi" - "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/globals" ) const ( - specialSkuName = "温馨提示" - startOpStoreStockNumber = 0 - endOpStoreStockNumber = model.MaxStoreSkuStockQty + specialSkuName = "温馨提示" + startOpStoreStockNumber = 0 + endOpStoreStockNumber = model.MaxStoreSkuStockQty startOpStoreTimeDefaultMTWM = int16(2200) - endOpStoreTimeDefaultMTWM = int16(2355) + endOpStoreTimeDefaultMTWM = int16(2355) startOpStoreTimeDefaultEBAI = int16(5) - endOpStoreTimeDefaultEBAI = int16(2355) + endOpStoreTimeDefaultEBAI = int16(2355) ) var ( - startOpStoreTimeListJXCS = []string { + startOpStoreTimeListJXCS = []string{ "22:10:00", } - endOpStoreTimeListJXCS = []string { + endOpStoreTimeListJXCS = []string{ "06:10:00", } - startOpStoreTimeListJXGY = []string { + startOpStoreTimeListJXGY = []string{ "22:00:00", } - endOpStoreTimeListJXGY = []string { + endOpStoreTimeListJXGY = []string{ "06:00:00", } - vendorList = map[int]bool { + vendorList = map[int]bool{ model.VendorIDMTWM: true, model.VendorIDEBAI: true, } @@ -74,7 +75,7 @@ func FilterSkuNameList(storeSkuNameList []*partner.SkuNameInfo) (filterStoreSkuN for _, skuNameInfo := range storeSkuNameList { if skuNameInfo.Name != specialSkuName { filterStoreSkuNameList = append(filterStoreSkuNameList, skuNameInfo) - } + } } return filterStoreSkuNameList } @@ -92,7 +93,7 @@ func StartOrEndOpStore(isStart bool, startTime, endTime int16, isAsync, isContin storeListValue := batchItemList[0].(*cms.StoreExt) storeID := storeListValue.ID if storeListValue.StoreMaps != nil { - for _, vendorListValue := range storeListValue.StoreMaps { + for _, vendorListValue := range storeListValue.StoreMaps { vendorID := int(utils.MustInterface2Int64(vendorListValue["vendorID"])) if _, ok := vendorList[vendorID]; ok { startOpStoreTime, endOpStoreTime := GetOpStoreTime(vendorID) @@ -107,7 +108,7 @@ func StartOrEndOpStore(isStart bool, startTime, endTime int16, isAsync, isContin storeSkuNameList, err := singleStoreHandler.GetStoreSkusFullInfo(ctx, task, storeID, vendorStoreID, nil) if err != nil { baseapi.SugarLogger.Errorf("StartOrEndOpStore GetStoreSkusFullInfo error:%v storeID:%d vendorID:%d vendorStoreID:%s", err, storeID, vendorID, vendorStoreID) - } else { + } else { filterStoreSkuNameList := FilterSkuNameList(storeSkuNameList) storeSkuList := putils.StoreSkuFullList2Bare(filterStoreSkuNameList) if len(storeSkuList) > 0 { @@ -115,8 +116,8 @@ func StartOrEndOpStore(isStart bool, startTime, endTime int16, isAsync, isContin AddOrDelExtraStoreOptime(vendorID, storeID, vendorStoreID, &storeListValue.Store, startOpStoreTime, endOpStoreTime, false) } - _, err = putils.FreeBatchStoreSkuInfo(func(batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { - for _, skuValue := range batchedStoreSkuList { + _, err = putils.FreeBatchStoreSkuInfo(func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { + for _, skuValue := range batchedStoreSkuList { skuValue.Stock = GetStockValue(isStart) } //var successList []*partner.StoreSkuInfo @@ -160,17 +161,17 @@ func StartOrEndOpStore(isStart bool, startTime, endTime int16, isAsync, isContin func InitEx() { if globals.IsMainProductEnv() { ScheduleTimerFunc(func() { - StartOrEndOpStore(true, 0, 0, false, true) - }, startOpStoreTimeListJXCS) + StartOrEndOpStore(true, 0, 0, false, true) + }, startOpStoreTimeListJXCS) ScheduleTimerFunc(func() { - StartOrEndOpStore(false, 0, 0, false, true) - }, endOpStoreTimeListJXCS) + StartOrEndOpStore(false, 0, 0, false, true) + }, endOpStoreTimeListJXCS) } else { ScheduleTimerFunc(func() { - StartOrEndOpStore(true, 0, 0, false, true) - }, startOpStoreTimeListJXGY) + StartOrEndOpStore(true, 0, 0, false, true) + }, startOpStoreTimeListJXGY) ScheduleTimerFunc(func() { - StartOrEndOpStore(false, 0, 0, false, true) - }, endOpStoreTimeListJXGY) + StartOrEndOpStore(false, 0, 0, false, true) + }, endOpStoreTimeListJXGY) } -} \ No newline at end of file +} diff --git a/business/partner/purchase/jd/store_sku2.go b/business/partner/purchase/jd/store_sku2.go index a82f69216..7318cae85 100644 --- a/business/partner/purchase/jd/store_sku2.go +++ b/business/partner/purchase/jd/store_sku2.go @@ -65,8 +65,8 @@ func (p *PurchaseHandler) getStoreSkusBareInfoLimitSize(ctx *jxcontext.Context, } func (p *PurchaseHandler) GetStoreSkusBareInfo(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorStoreID string, inStoreSkuList []*partner.StoreSkuInfo) (outStoreSkuList []*partner.StoreSkuInfo, err error) { - result, err := putils.FreeBatchStoreSkuInfo(func(batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { - list, err := p.getStoreSkusBareInfoLimitSize(ctx, nil, storeID, vendorStoreID, batchedStoreSkuList) + result, err := putils.FreeBatchStoreSkuInfo(func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { + list, err := p.getStoreSkusBareInfoLimitSize(ctx, task, storeID, vendorStoreID, batchedStoreSkuList) if err == nil { result = list }