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

Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark

Browse Source
This commit is contained in:
苏尹岚
2020-06-01 08:30:06 +08:00
parent 72511208fb 39bf772dda
commit 0fc1f8812c
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/partner/delivery/mtps/store.go
View File

@@ -132,8 +132,8 @@ func (c *DeliveryHandler) IsErrStoreExist(err error) bool {
} }
func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) { func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) {
if globals.EnableStoreWrite { // if globals.EnableStoreWrite {
err = api.MtpsAPI.PagePoiUpdate(storeDetail.VendorStoreID, storeDetail.PayeeName, storeDetail.Tel1, fakeContactEmail) // err = api.MtpsAPI.PagePoiUpdate(storeDetail.VendorStoreID, storeDetail.PayeeName, storeDetail.Tel1, fakeContactEmail)
} // }
return err return err
} }

18
business/partner/purchase/jdshop/store_sku.go
View File

@@ -253,7 +253,7 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
storeSkus, err2 := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID}, []int{v.SkuID}) storeSkus, err2 := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID}, []int{v.SkuID})
err = err2 err = err2
if len(storeSkus) > 0 { if len(storeSkus) > 0 {
if storeSkus[0].JdsID != 0 { if storeSkus[0].JdsID != 0 && vendorStoreID != "" {
err = api.JdShopAPI.UpdateSkuSiteStock(storeSkus[0].JdsID, stock, utils.Str2Int(vendorStoreID)) err = api.JdShopAPI.UpdateSkuSiteStock(storeSkus[0].JdsID, stock, utils.Str2Int(vendorStoreID))
} }
} }
@@ -309,8 +309,9 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
if status == -1 { if status == -1 {
return fmt.Errorf("京东商城店内分类创建失败！") return fmt.Errorf("京东商城店内分类创建失败！")
} }
flag := false time.Sleep(time.Second * 2)
for { // flag := false
// for {
result, err := api.JdShopAPI.FindShopCategories() result, err := api.JdShopAPI.FindShopCategories()
if err != nil { if err != nil {
return err return err
@@ -318,15 +319,14 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
for _, v := range result { for _, v := range result {
if v.Name == storeCat.Name { if v.Name == storeCat.Name {
storeCat.VendorCatID = utils.Int64ToStr(v.CID) storeCat.VendorCatID = utils.Int64ToStr(v.CID)
flag = true // flag = true
break
}
}
time.Sleep(time.Second * 2)
if flag {
break break
} }
} }
// if flag {
// break
// }
// }
} }
return err return err
} }