|
|
|
@@ -674,7 +674,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); |
|
|
|
WxRentContract wxRentContractQuery = new WxRentContract(); |
|
|
|
wxRentContractQuery.updateTenantInfo(record); |
|
|
|
Long shopId = rentInfoObject.getLong("shopId"); |
|
|
|
Long shopId = rentInfoObject.getLong("id"); |
|
|
|
String shopNumber = rentInfoObject.getString("shopNumber"); |
|
|
|
if (shopId == null) { |
|
|
|
return new ResultData(ErrorCode.SHOP_IS_NOT_FOUND.getCode(), "店铺 " + shopNumber + " 已删除"); |
|
|
|
@@ -699,9 +699,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
if (wxShop == null) { |
|
|
|
return new ResultData(ErrorCode.SHOP_IS_NOT_FOUND.getCode(), "店铺 " + shopNumber + " 已删除"); |
|
|
|
} |
|
|
|
if (wxShop.getStatus().equals(EnumShopStatus.RENT.getCode())) { |
|
|
|
return new ResultData(ErrorCode.SHOP_IS_RENT.getCode(), "店铺 " + wxShop.getShopNumber() + " 已出租"); |
|
|
|
} |
|
|
|
// if (wxShop.getStatus().equals(EnumShopStatus.RENT.getCode())) { |
|
|
|
// return new ResultData(ErrorCode.SHOP_IS_RENT.getCode(), "店铺 " + wxShop.getShopNumber() + " 已出租"); |
|
|
|
// } |
|
|
|
} |
|
|
|
if (!shopList.contains(shopId)) { |
|
|
|
shopList.add(shopId); |
|
|
|
|