Merge branch 'master' into lcw

This commit is contained in:
gazebo
2019-04-04 12:37:14 +08:00
4 changed files with 38 additions and 35 deletions

View File

@@ -182,11 +182,11 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
mergeStatus := jxutils.MergeStoreStatus(store.Status, store.EbaiStoreStatus)
if store2.Status != mergeStatus {
if mergeStatus == model.StoreStatusOpened {
err = api.EbaiAPI.ShopOnline("", utils.Str2Int64(store.VendorStoreID))
} else if mergeStatus == model.StoreStatusClosed {
err = api.EbaiAPI.ShopOffline("", utils.Str2Int64(store.VendorStoreID))
err = api.EbaiAPI.ShopOpen("", utils.Str2Int64(store.VendorStoreID))
} else if mergeStatus == model.StoreStatusClosed {
err = api.EbaiAPI.ShopClose("", utils.Str2Int64(store.VendorStoreID))
} else if mergeStatus == model.StoreStatusDisabled {
err = api.EbaiAPI.ShopOffline("", utils.Str2Int64(store.VendorStoreID))
}
if intErr, ok := err.(*utils.ErrorWithCode); ok && intErr.IntCode() == 201100 {
err = nil