From 4b2e4dc8e8ea4298e535318c30beee089d2c641c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 12 Nov 2020 10:36:40 +0800 Subject: [PATCH] beta --- .../jxcallback/scheduler/defsch/defsch.go | 1 + business/jxstore/tempop/tempop.go | 175 +++++++++++------- 2 files changed, 105 insertions(+), 71 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 93271734a..ed589407e 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -803,6 +803,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf if savedOrderInfo.storeDetail.OpenTime1 != 0 && savedOrderInfo.storeDetail.CloseTime1 != 0 { time1 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.OpenTime1, time.Now()) time2 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.CloseTime1, time.Now()) + globals.SugarLogger.Debugf("三方运单不在门店营业时间范围 ：time1 %v ,time2 %v", time1, time2) if time.Now().Sub(time1) < 0 || time.Now().Sub(time2) > 0 { if savedOrderInfo.storeDetail.OpenTime2 != 0 && savedOrderInfo.storeDetail.CloseTime2 != 0 { time3 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.OpenTime2, time.Now()) diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index c86434bfb..f41c125e1 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1711,62 +1711,67 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // } var ( jdStoreIDs = []string{ - "11734848", - "11734850", - "11734854", - "11734862", - "11734868", - "11734873", - "11734874", - "11734886", - "11748353", - "11890095", - "11800399", - "11738114", - "11857499", - "11873440", - "11883071", - "11734852", - "11886763", - "11874614", - "11734884", - "11926674", - "11929173", - "11894144", - "11734861", - "11951611", - "11800403", - "11913597", - "11980746", - "11981675", - "12011812", - "12007545", - "11734846", - "12005417", - "12005640", - "12005682", - "12006134", - "11982352", - "12007250", - "12007560", - "11982427", - "12008087", - "12035806", - "12008160", - "12008395", - "12009345", - "11940019", - "12010237", - "12010654", - "12011111", - "12006857", - "11734851", - "12030632", - "12050456", + "11053494", + // "11734848", + // "11734850", + // "11734854", + // "11734862", + // "11734868", + // "11734873", + // "11734874", + // "11734886", + // "11748353", + // "11890095", + // "11800399", + // "11738114", + // "11857499", + // "11873440", + // "11883071", + // "11734852", + // "11886763", + // "11874614", + // "11734884", + // "11926674", + // "11929173", + // "11894144", + // "11734861", + // "11951611", + // "11800403", + // "11913597", + // "11980746", + // "11981675", + // "12011812", + // "12007545", + // "11734846", + // "12005417", + // "12005640", + // "12005682", + // "12006134", + // "11982352", + // "12007250", + // "12007560", + // "11982427", + // "12008087", + // "12035806", + // "12008160", + // "12008395", + // "12009345", + // "11940019", + // "12010237", + // "12010654", + // "12011111", + // "12006857", + // "11734851", + // "12030632", + // "12050456", } - jdStoreIDxipu = "11890095" + jdStoreIDxipu = "11053496" skuMap = make(map[string]*partner.StoreSkuInfo) - // priceList []*pa + priceList = make(map[string][]*partner.StoreSkuInfo) + statusList1 = make(map[string][]*partner.StoreSkuInfo) + statusList2 = make(map[string][]*partner.StoreSkuInfo) + stockList = make(map[string][]*partner.StoreSkuInfo) + vendorOrgCode = "82029" ) StoreSkuFullList2BareFilter := func(storeSkuFull []*partner.SkuNameInfo) (bareStoreSkuList []*partner.StoreSkuInfo) { for _, v := range storeSkuFull { @@ -1780,29 +1785,57 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { } handler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler) multiHandler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IMultipleStoresHandler) - allSkuNameInfoList, err := multiHandler.GetSkus(ctx, "320406", 0, "") + allSkuNameInfoList, err := multiHandler.GetSkus(ctx, vendorOrgCode, 0, "") skuInfos := StoreSkuFullList2BareFilter(allSkuNameInfoList) - outStoreSkuList, err := handler.GetStoreSkusBareInfo(ctx, "320406", nil, 0, jdStoreIDxipu, skuInfos) + outStoreSkuList, err := handler.GetStoreSkusBareInfo(ctx, vendorOrgCode, nil, 0, jdStoreIDxipu, skuInfos) for _, v := range outStoreSkuList { skuMap[v.VendorSkuID] = v } - task := tasksch.NewParallelTask("初始化京东", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, - func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - jdStoreID := batchItemList[0].(string) - outStoreSkuList2, err := handler.GetStoreSkusBareInfo(ctx, "320406", nil, 0, jdStoreID, skuInfos) - for _, v := range outStoreSkuList2 { - if skuMap[v.VendorSkuID] != nil { - continue - } - if skuMap[v.VendorSkuID].VendorPrice != v.VendorPrice { - v.VendorPrice = skuMap[v.VendorSkuID].VendorPrice - + for _, jdStoreID := range jdStoreIDs { + outStoreSkuList2, _ := handler.GetStoreSkusBareInfo(ctx, vendorOrgCode, nil, 0, jdStoreID, skuInfos) + for _, v := range outStoreSkuList2 { + if skuMap[v.VendorSkuID] != nil { + continue + } + if skuMap[v.VendorSkuID].VendorPrice != v.VendorPrice { + v.VendorPrice = skuMap[v.VendorSkuID].VendorPrice + priceList[jdStoreID] = append(priceList[jdStoreID], v) + } + if skuMap[v.VendorSkuID].Status != v.Status { + v.Status = skuMap[v.VendorSkuID].Status + if v.Status == model.SkuStatusNormal { + statusList1[jdStoreID] = append(statusList1[jdStoreID], v) + } else { + statusList2[jdStoreID] = append(statusList2[jdStoreID], v) } } - return retVal, err - }, jdStoreIDs) - tasksch.HandleTask(task, nil, true).Run() - task.GetID() + if skuMap[v.VendorSkuID].Stock != v.Stock { + v.Stock = skuMap[v.VendorSkuID].Stock + stockList[jdStoreID] = append(stockList[jdStoreID], v) + } + } + } + if len(priceList) > 0 { + fmt.Println(utils.Format4Output(priceList, false)) + // for k, v := range priceList { + // handler.UpdateStoreSkusPrice(ctx, vendorOrgCode, 0, k, v) + // } + } + if len(statusList1) > 0 { + // for k, v := range statusList1 { + // handler.UpdateStoreSkusStatus(ctx, vendorOrgCode, 0, k, v, v[0].Status) + // } + } + if len(statusList2) > 0 { + // for k, v := range statusList2 { + // handler.UpdateStoreSkusStatus(ctx, vendorOrgCode, 0, k, v, v[0].Status) + // } + } + if len(stockList) > 0 { + // for k, v := range stockList { + // handler.UpdateStoreSkusStock(ctx, vendorOrgCode, 0, k, v) + // } + } return err }