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

This commit is contained in:
邹宗楠
2022-10-14 09:01:23 +08:00

View File

@@ -292,7 +292,9 @@ func (p *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCod
unsuspendStoreID := &shop_unsuspendStore_request.ShopUnsuspendStoreParam{ unsuspendStoreID := &shop_unsuspendStore_request.ShopUnsuspendStoreParam{
StoreId: utils.Str2Int64(vendorStoreID), StoreId: utils.Str2Int64(vendorStoreID),
} }
_, err = api.UnsuspendStore(unsuspendStoreID) if _, err = api.UnsuspendStore(unsuspendStoreID); err != nil {
return err
}
} else { //恢复营业 } else { //恢复营业
suspendStoreID := &shop_storeSuspend_request.ShopStoreSuspendParam{ suspendStoreID := &shop_storeSuspend_request.ShopStoreSuspendParam{
StoreId: utils.Str2Int64(vendorStoreID), StoreId: utils.Str2Int64(vendorStoreID),
@@ -308,7 +310,9 @@ func (p *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCod
if remoteStoreInfo.StoreDetail.Store.SuspendType == tiktok_api.SuspendTypePlatformPenalty { if remoteStoreInfo.StoreDetail.Store.SuspendType == tiktok_api.SuspendTypePlatformPenalty {
err = errors.New("门店因平台处罚暂停营业,不可主动修改营业状态") err = errors.New("门店因平台处罚暂停营业,不可主动修改营业状态")
} else { } else {
_, err = api.StoreSuspend(suspendStoreID) if _, err = api.StoreSuspend(suspendStoreID); err != nil {
return err
}
} }
} }
} }
@@ -627,15 +631,15 @@ func (P *PurchaseHandler) GetAllStoresVendorID(ctx *jxcontext.Context, vendorOrg
func (P *PurchaseHandler) UpdateStoreLineStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, lineStatus int) (err error) { func (P *PurchaseHandler) UpdateStoreLineStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, lineStatus int) (err error) {
api := getAPI(vendorOrgCode, storeID, vendorStoreID) api := getAPI(vendorOrgCode, storeID, vendorStoreID)
if lineStatus == model.StoreStatusOpened { if lineStatus == model.StoreStatusOpened {
param := &shop_storeSuspend_request.ShopStoreSuspendParam{
StoreId: utils.Str2Int64(vendorStoreID),
}
_, err = api.StoreSuspend(param)
} else {
param := &shop_unsuspendStore_request.ShopUnsuspendStoreParam{ param := &shop_unsuspendStore_request.ShopUnsuspendStoreParam{
StoreId: utils.Str2Int64(vendorStoreID), StoreId: utils.Str2Int64(vendorStoreID),
} }
_, err = api.UnsuspendStore(param) _, err = api.UnsuspendStore(param)
} else {
param := &shop_storeSuspend_request.ShopStoreSuspendParam{
StoreId: utils.Str2Int64(vendorStoreID),
}
_, err = api.StoreSuspend(param)
} }
return err return err
} }