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

商品分类修改

Browse Source
This commit is contained in:
苏尹岚
2020-05-22 15:37:00 +08:00
parent e176bd8754
commit dc7c9d210c
3 changed files with 68 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
business/jxstore/cms/store_sku.go
View File

@@ -13,6 +13,8 @@ import (
"time" "time"
"unicode" "unicode"
"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/jx-callback/globals/refutil" "git.rosy.net.cn/jx-callback/globals/refutil"
@@ -4427,5 +4429,15 @@ func focusC4Matters(ctx *jxcontext.Context, db *dao.DaoDB, v *model.Sku) (err er
} }
func RefreshJdsSkusStatus(ctx *jxcontext.Context) (err error) { func RefreshJdsSkusStatus(ctx *jxcontext.Context) (err error) {
handler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJDShop).(partner.ISingleStoreStoreSkuHandler)
remoteSkuList, err := handler.GetStoreSkusFullInfo(ctx, nil, 0, "", nil)
for _, v := range remoteSkuList {
if v.Status == jdshopapi.JdsSkuStatus2 {
reason, err := api.JdShopAPI.FindOpReason(utils.Str2Int64(v.VendorNameID))
if err == nil && reason == jdshopapi.PassReason {
err = api.JdShopAPI.UpOrDown(utils.Str2Int64(v.VendorNameID), jdshopapi.JdsSkuStatus1)
}
}
}
return err return err
} }

98
business/jxstore/cms/sync.go
View File

@@ -1119,10 +1119,10 @@ func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch
skusMap = make(map[int]*model.StoreSkuBind) skusMap = make(map[int]*model.StoreSkuBind)
updateList []*model.StoreSkuBind updateList []*model.StoreSkuBind
addList []*model.StoreSkuBind addList []*model.StoreSkuBind
skuBindInfos1 []*StoreSkuBindInfo // skuBindInfos1 []*StoreSkuBindInfo
skuBindInfos2 []*StoreSkuBindInfo // skuBindInfos2 []*StoreSkuBindInfo
resultInterface1 []interface{} // resultInterface1 []interface{}
resultInterface2 []interface{} // resultInterface2 []interface{}
) )
storeSkusMain, err := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID}, nil) storeSkusMain, err := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID}, nil)
for _, v := range storeSkusMain { for _, v := range storeSkusMain {
@@ -1142,50 +1142,52 @@ func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch
} }
} }
} }
task := tasksch.NewParallelTask("正在同步京东商城的库存商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx, fmt.Println("updateList", utils.Format4Output(updateList, false))
func(ptTask *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { fmt.Println("addList", utils.Format4Output(addList, false))
step := batchItemList[0].(int) // task := tasksch.NewParallelTask("正在同步京东商城的库存商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
switch step { // func(ptTask *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
case 0: // step := batchItemList[0].(int)
if len(updateList) > 0 { // switch step {
task := tasksch.NewParallelTask("同步门店库存", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx, // case 0:
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { // if len(updateList) > 0 {
storeBind := batchItemList[0].(*model.StoreSkuBind) // task := tasksch.NewParallelTask("同步门店库存", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
retVal = []*StoreSkuBindInfo{buildStoreSkuBindInfo(db, storeMap.StoreID, storeBind, false)} // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
return retVal, err // storeBind := batchItemList[0].(*model.StoreSkuBind)
}, updateList) // retVal = []*StoreSkuBindInfo{buildStoreSkuBindInfo(db, storeMap.StoreID, storeBind, false)}
tasksch.HandleTask(task, ptTask, false).Run() // return retVal, err
resultInterface1, err = task.GetResult(0) // }, updateList)
for _, v := range resultInterface1 { // tasksch.HandleTask(task, ptTask, false).Run()
skuBindInfos1 = append(skuBindInfos1, v.(*StoreSkuBindInfo)) // resultInterface1, err = task.GetResult(0)
} // for _, v := range resultInterface1 {
hint, err = UpdateStoresSkusByBind(ctx, ptTask, skuBindInfos1, isAsync, isContinueWhenError, false) // skuBindInfos1 = append(skuBindInfos1, v.(*StoreSkuBindInfo))
} // }
case 1: // hint, err = UpdateStoresSkusByBind(ctx, ptTask, skuBindInfos1, isAsync, isContinueWhenError, false)
if len(addList) > 0 { // }
task := tasksch.NewParallelTask("同步门店商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx, // case 1:
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { // if len(addList) > 0 {
storeBind := batchItemList[0].(*model.StoreSkuBind) // task := tasksch.NewParallelTask("同步门店商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
retVal = []*StoreSkuBindInfo{buildStoreSkuBindInfo(db, storeMap.StoreID, storeBind, true)} // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
return retVal, err // storeBind := batchItemList[0].(*model.StoreSkuBind)
}, addList) // retVal = []*StoreSkuBindInfo{buildStoreSkuBindInfo(db, storeMap.StoreID, storeBind, true)}
tasksch.HandleTask(task, ptTask, false).Run() // return retVal, err
resultInterface2, err = task.GetResult(0) // }, addList)
for _, v := range resultInterface2 { // tasksch.HandleTask(task, ptTask, false).Run()
skuBindInfos2 = append(skuBindInfos2, v.(*StoreSkuBindInfo)) // resultInterface2, err = task.GetResult(0)
} // for _, v := range resultInterface2 {
hint, err = UpdateStoresSkusByBind(ctx, ptTask, skuBindInfos2, isAsync, isContinueWhenError, false) // skuBindInfos2 = append(skuBindInfos2, v.(*StoreSkuBindInfo))
} // }
} // hint, err = UpdateStoresSkusByBind(ctx, ptTask, skuBindInfos2, isAsync, isContinueWhenError, false)
return retVal, err // }
}, []int{0, 1}) // }
tasksch.HandleTask(task, nil, true).Run() // return retVal, err
if isAsync { // }, []int{0, 1})
hint = task.GetID() // tasksch.HandleTask(task, nil, true).Run()
} else { // if isAsync {
_, err = task.GetResult(0) // hint = task.GetID()
hint = "1" // } else {
} // _, err = task.GetResult(0)
// hint = "1"
// }
return hint, err return hint, err
} }

3
business/jxstore/misc/misc.go
View File

@@ -402,7 +402,8 @@ func doDailyWork() {
//刷新京东商城订单结算价 //刷新京东商城订单结算价
orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, time.Now().AddDate(0, 0, -3).Format("20060102"), time.Now().Format("20060102")) orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, time.Now().AddDate(0, 0, -3).Format("20060102"), time.Now().Format("20060102"))
//同步京东商城门店库存和商品 //同步京东商城门店库存和商品
//同步上架京东商城待售商品
cms.RefreshJdsSkusStatus(jxcontext.AdminCtx)
} }
func RefreshRealMobile(ctx *jxcontext.Context, vendorID int, fromTime, toTime time.Time, isAsync, isContinueWhenError bool) (hint string, err error) { func RefreshRealMobile(ctx *jxcontext.Context, vendorID int, fromTime, toTime time.Time, isAsync, isContinueWhenError bool) (hint string, err error) {