From b28b6bb85824ce7953aee14b9f88725785ef280f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 11 Apr 2019 16:55:26 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=BA=97=E9=93=BA=E5=B7=B2=E5=87=BA=E7=A7=9F?= =?UTF-8?q?=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index c217964a7..3eb7dfd06 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -299,13 +299,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { for (long shopid : shopidlist) { WxShop shop = wxShopMapper.selectByPrimaryKey(shopid); if (shop.getStatus().equals(EnumShopStatus.RENT.getCode())) { - rentShopList.add(shop); + return new ResultData(ErrorCode.SHOP_IS_RENT.getCode(), "店铺 " + shop.getShopNumber() + " 已出租"); } } - //已出租的商铺 - if (!rentShopList.isEmpty()) { - return new ResultData(ErrorCode.SHOP_IS_RENT, rentShopList); - } //更新商铺 for (long shopid : shopidlist) { //更新商铺状态