diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 2f9fae2d9..458997a37 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -85,7 +85,7 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo storeCatMap.ID = catInfo.MapID var failedList []*partner.StoreSkuInfoWithErr if catInfo.IsExdSpec == model.YES { - if vendorID == model.VendorIDJD || vendorID == model.VendorIDMTWM { + if vendorID == model.VendorIDJD || vendorID == model.VendorIDMTWM || vendorID == model.VendorIDYB { return nil, err } } diff --git a/business/partner/purchase/yb/store_sku.go b/business/partner/purchase/yb/store_sku.go index f11603761..38630c120 100644 --- a/business/partner/purchase/yb/store_sku.go +++ b/business/partner/purchase/yb/store_sku.go @@ -159,15 +159,43 @@ func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, vendorOrg return failedList, err } +func (p *PurchaseHandler) GetStoreAllCategories(ctx *jxcontext.Context, storeID int, vendorStoreID string) (cats []*partner.BareCategoryInfo, err error) { + vendorOrgCode, err := buildYbConfigs(storeID) + if err != nil { + return nil, err + } + remoteCats, err := api.YinBaoAPI.LoadCategorysWithOption(vendorOrgCode) + if err == nil { + cats = convertVendorCatList(remoteCats) + } + return cats, err +} + func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) { + if globals.EnableYbStoreWrite { + vendorOrgCode, err := buildYbConfigs(storeID) + if err != nil { + return err + } + vendorCatID, err := api.YinBaoAPI.AddNewCategory(vendorOrgCode, storeCat.Name, storeCat.ParentCatName) + if err == nil { + storeCat.VendorCatID = vendorCatID + } + } return err } func (p *PurchaseHandler) UpdateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) { + if globals.EnableYbStoreWrite { + + } return err } func (p *PurchaseHandler) DeleteStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID, vendorCatID string, level int) (err error) { + if globals.EnableYbStoreWrite { + + } return err } @@ -175,6 +203,10 @@ func (p *PurchaseHandler) IsErrSkuExist(err error) (isExist bool) { return yinbaoapi.IsErrSkuExist(err) } +func (p *PurchaseHandler) IsErrCategoryExist(err error) (isExist bool) { + return yinbaoapi.IsErrCategoryExist(err) +} + func (p *PurchaseHandler) GetStoreSkusBatchSize(funcID int) (batchSize int) { return 1 } @@ -271,14 +303,31 @@ func buildProductInfoParam(storeSku *dao.StoreSkuSyncInfo) (productInfoParam *yi return productInfoParam } -func buildYbConfigs(storeID int) (err error) { +func buildYbConfigs(storeID int) (vendorOrgCode string, err error) { if storeID == 0 { - return fmt.Errorf("门店ID不能为空!平台:[%v]", model.VendorIDYB) + return "", fmt.Errorf("门店ID不能为空!平台:[%v]", model.VendorIDYB) } store, err := dao.GetStoreDetail(dao.GetDB(), storeID, model.VendorIDYB) if err != nil { - return err + return "", err } api.YinBaoAPI = yinbaoapi.New(store.YbAppKey, store.YbAppID) - return err + vendorOrgCode = store.VendorOrgCode + return vendorOrgCode, err +} + +func convertVendorCatList(remoteCats []*yinbaoapi.LoadCategorysWithOptionResult) (cats []*partner.BareCategoryInfo) { + for _, rCat := range remoteCats { + cat := &partner.BareCategoryInfo{ + VendorCatID: rCat.TxtUID, + Name: rCat.Name, + } + if rCat.TxtParentUID == "" { + cat.Level = 1 + } else { + cat.Level = 2 + } + cats = append(cats, cat) + } + return cats } diff --git a/conf/app.conf b/conf/app.conf index 97887e719..13996ba5f 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -174,7 +174,7 @@ jd2Token = "29e0e567-c475-433a-aff0-37176ee8d8a7" jd2AppKey = "7fb947624ff847ae94ff2f068cc99652" jd2Secret = "1097abd7ef09427099b4922784af123a" -jdEclpAccessToken = "7e9c1a5fe4ac4ea48c3c572d488e60b8hnwz" +jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm" jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3" jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933" @@ -289,7 +289,7 @@ dingdingCallbackURL = "http://callback-jxgy.jxc4.com/dingding/msg" getWeixinTokenURL = "http://www.jxc4.com/v2/sys/GetWXToken" getYLYTokenURL = "http://www.jxc4.com/v2/sys/GetYLYToken" -jdEclpAccessToken = "7e9c1a5fe4ac4ea48c3c572d488e60b8hnwz" +jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm" jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3" jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933" @@ -382,7 +382,7 @@ jd2Token = "29e0e567-c475-433a-aff0-37176ee8d8a7" jd2AppKey = "7fb947624ff847ae94ff2f068cc99652" jd2Secret = "1097abd7ef09427099b4922784af123a" -jdEclpAccessToken = "7e9c1a5fe4ac4ea48c3c572d488e60b8hnwz" +jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm" jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3" jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"