From 8cfa851892ba79d762f58212466ed3f7920cd27e Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 17 Aug 2020 15:29:51 +0800 Subject: [PATCH] fix contract --- .../controller/contract/WxRentContractController.java | 1 + .../iformall/service/impl/WxRentContractServiceImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index b80df9888..554425b1c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -136,6 +136,7 @@ public class WxRentContractController extends WxContractBaseController { } MallUserInfo user = getUser(); wxRentContract.updateTenantInfo(user); + //wxRentContract.setTenantId("789"); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); Date oldDate = wxRentContract.getRentalStartDate(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 5cbffe08f..dc45663ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -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);