liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

beta

Browse Source
This commit is contained in:
苏尹岚
2020-11-12 10:36:40 +08:00
parent f13a5fb3a2
commit 4b2e4dc8e8
2 changed files with 105 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -803,6 +803,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
if savedOrderInfo.storeDetail.OpenTime1 != 0 && savedOrderInfo.storeDetail.CloseTime1 != 0 { if savedOrderInfo.storeDetail.OpenTime1 != 0 && savedOrderInfo.storeDetail.CloseTime1 != 0 {
time1 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.OpenTime1, time.Now()) time1 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.OpenTime1, time.Now())
time2 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.CloseTime1, 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 time.Now().Sub(time1) < 0 || time.Now().Sub(time2) > 0 {
if savedOrderInfo.storeDetail.OpenTime2 != 0 && savedOrderInfo.storeDetail.CloseTime2 != 0 { if savedOrderInfo.storeDetail.OpenTime2 != 0 && savedOrderInfo.storeDetail.CloseTime2 != 0 {
time3 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.OpenTime2, time.Now()) time3 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.OpenTime2, time.Now())

175
business/jxstore/tempop/tempop.go
View File

@@ -1711,62 +1711,67 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// } // }
var ( var (
jdStoreIDs = []string{ jdStoreIDs = []string{
"11734848", "11053494",
"11734850", // "11734848",
"11734854", // "11734850",
"11734862", // "11734854",
"11734868", // "11734862",
"11734873", // "11734868",
"11734874", // "11734873",
"11734886", // "11734874",
"11748353", // "11734886",
"11890095", // "11748353",
"11800399", // "11890095",
"11738114", // "11800399",
"11857499", // "11738114",
"11873440", // "11857499",
"11883071", // "11873440",
"11734852", // "11883071",
"11886763", // "11734852",
"11874614", // "11886763",
"11734884", // "11874614",
"11926674", // "11734884",
"11929173", // "11926674",
"11894144", // "11929173",
"11734861", // "11894144",
"11951611", // "11734861",
"11800403", // "11951611",
"11913597", // "11800403",
"11980746", // "11913597",
"11981675", // "11980746",
"12011812", // "11981675",
"12007545", // "12011812",
"11734846", // "12007545",
"12005417", // "11734846",
"12005640", // "12005417",
"12005682", // "12005640",
"12006134", // "12005682",
"11982352", // "12006134",
"12007250", // "11982352",
"12007560", // "12007250",
"11982427", // "12007560",
"12008087", // "11982427",
"12035806", // "12008087",
"12008160", // "12035806",
"12008395", // "12008160",
"12009345", // "12008395",
"11940019", // "12009345",
"12010237", // "11940019",
"12010654", // "12010237",
"12011111", // "12010654",
"12006857", // "12011111",
"11734851", // "12006857",
"12030632", // "11734851",
"12050456", // "12030632",
// "12050456",
} }
jdStoreIDxipu = "11890095" jdStoreIDxipu = "11053496"
skuMap = make(map[string]*partner.StoreSkuInfo) 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) { StoreSkuFullList2BareFilter := func(storeSkuFull []*partner.SkuNameInfo) (bareStoreSkuList []*partner.StoreSkuInfo) {
for _, v := range storeSkuFull { for _, v := range storeSkuFull {
@@ -1780,29 +1785,57 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
} }
handler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler) handler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler)
multiHandler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IMultipleStoresHandler) multiHandler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IMultipleStoresHandler)
allSkuNameInfoList, err := multiHandler.GetSkus(ctx, "320406", 0, "") allSkuNameInfoList, err := multiHandler.GetSkus(ctx, vendorOrgCode, 0, "")
skuInfos := StoreSkuFullList2BareFilter(allSkuNameInfoList) 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 { for _, v := range outStoreSkuList {
skuMap[v.VendorSkuID] = v skuMap[v.VendorSkuID] = v
} }
task := tasksch.NewParallelTask("初始化京东", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, for _, jdStoreID := range jdStoreIDs {
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { outStoreSkuList2, _ := handler.GetStoreSkusBareInfo(ctx, vendorOrgCode, nil, 0, jdStoreID, skuInfos)
jdStoreID := batchItemList[0].(string) for _, v := range outStoreSkuList2 {
outStoreSkuList2, err := handler.GetStoreSkusBareInfo(ctx, "320406", nil, 0, jdStoreID, skuInfos) if skuMap[v.VendorSkuID] != nil {
for _, v := range outStoreSkuList2 { continue
if skuMap[v.VendorSkuID] != nil { }
continue if skuMap[v.VendorSkuID].VendorPrice != v.VendorPrice {
} v.VendorPrice = skuMap[v.VendorSkuID].VendorPrice
if skuMap[v.VendorSkuID].VendorPrice != v.VendorPrice { priceList[jdStoreID] = append(priceList[jdStoreID], v)
v.VendorPrice = skuMap[v.VendorSkuID].VendorPrice }
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 if skuMap[v.VendorSkuID].Stock != v.Stock {
}, jdStoreIDs) v.Stock = skuMap[v.VendorSkuID].Stock
tasksch.HandleTask(task, nil, true).Run() stockList[jdStoreID] = append(stockList[jdStoreID], v)
task.GetID() }
}
}
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 return err
} }