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

aa

Browse Source
This commit is contained in:
suyl
2021-05-26 14:56:31 +08:00
parent 166a8ca76b
commit 99d0f32a7e
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5644,10 +5644,10 @@ func CopyMtToJd(ctx *jxcontext.Context, mtStoreID, mtOrgCode, jdStoreID, jdOrgCo
catMap = make(map[string]string) catMap = make(map[string]string)
LoopCatChild funcType LoopCatChild funcType
) )
mtStoreID = "11655829" //mtStoreID = "11655829"
mtOrgCode = "589" //mtOrgCode = "589"
jdStoreID = "12116911" //jdStoreID = "12116911"
jdOrgCode = "364156" //jdOrgCode = "364156"
jd := jd.GetAPI(jdOrgCode) jd := jd.GetAPI(jdOrgCode)
//获取token //获取token
mtapi := apimanager.CurAPIManager.GetAPI(model.VendorIDMTWM, mtOrgCode).(*mtwmapi.API) mtapi := apimanager.CurAPIManager.GetAPI(model.VendorIDMTWM, mtOrgCode).(*mtwmapi.API)
@@ -5693,7 +5693,6 @@ func CopyMtToJd(ctx *jxcontext.Context, mtStoreID, mtOrgCode, jdStoreID, jdOrgCo
case 1: case 1:
//建商品 //建商品
//skuList, _ := mtapi.RetailListAll(mtStoreID) //skuList, _ := mtapi.RetailListAll(mtStoreID)
fmt.Println("map111111111111111111111111111111111111111111111111111111", catMap)
skuList, _ := mtapi.RetailList(mtStoreID, 0, 2) skuList, _ := mtapi.RetailList(mtStoreID, 0, 2)
task2 := tasksch.NewParallelTask("美团到京东, 建商品", tasksch.NewParallelConfig().SetIsContinueWhenError(true).SetParallelCount(1), ctx, task2 := tasksch.NewParallelTask("美团到京东, 建商品", tasksch.NewParallelConfig().SetIsContinueWhenError(true).SetParallelCount(1), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
@@ -5725,7 +5724,7 @@ func CopyMtToJd(ctx *jxcontext.Context, mtStoreID, mtOrgCode, jdStoreID, jdOrgCo
param.ShopCategories = append(param.ShopCategories, utils.Str2Int64(catMap[mtSku.CategoryCode])) param.ShopCategories = append(param.ShopCategories, utils.Str2Int64(catMap[mtSku.CategoryCode]))
} }
param.ProductDesc = fmt.Sprintf(`<img src="%s" alt="一张图片" />`, mtSku.PictureContents) param.ProductDesc = fmt.Sprintf(`<img src="%s" alt="一张图片" />`, mtSku.PictureContents)
skuID, _ := jd.AddSku2(param) skuID, err := jd.AddSku2(param)
if skuID != "" { if skuID != "" {
jd.UpdateCurrentQty(ctx.GetTrackInfo(), jdStoreID, utils.Str2Int64(skuID), utils.Str2Int(mtSku.SkuList[0].Stock)) jd.UpdateCurrentQty(ctx.GetTrackInfo(), jdStoreID, utils.Str2Int64(skuID), utils.Str2Int(mtSku.SkuList[0].Stock))
jd.UpdateVendibility(ctx.GetTrackInfo(), []*jdapi.QueryStockRequest{ jd.UpdateVendibility(ctx.GetTrackInfo(), []*jdapi.QueryStockRequest{

5
business/partner/purchase/jdshop/store.go
View File

@@ -362,6 +362,10 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
_, err = dao.UpdateEntity(db, storeMap, "VendorStoreID") _, err = dao.UpdateEntity(db, storeMap, "VendorStoreID")
} }
} }
if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
mergedStoreStatus := jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)
p.UpdateStoreStatus(jxcontext.AdminCtx, storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID, mergedStoreStatus)
}
return vendorStoreID, err return vendorStoreID, err
} }
@@ -387,6 +391,7 @@ func (p *PurchaseHandler) EnableAutoAcceptOrder(ctx *jxcontext.Context, vendorOr
} }
func (c *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, status int) (err error) { func (c *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, status int) (err error) {
err = api.JdShopAPI.UpdateStatus(utils.Str2Int(vendorStoreID), jxStatus2JdsStatus(status))
return err return err
} }