From 8d33f552218b65bf0debe36521c4f955728d4514 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 20 Jun 2019 13:08:44 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=89=A9=E4=B8=9A=E8=B4=A6=E5=8D=95=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/contract/WxPropertyContractController.java | 6 ------ .../service/impl/WxPropertyContractServiceImpl.java | 7 ++++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index be0b06fa4..9e2afe7d7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -71,12 +71,6 @@ public class WxPropertyContractController extends BaseController { public ResultData updateRentStartTime(@RequestBody WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); - propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate()); - - if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ - propertyContract.setRentalStartDate(propertyContract.getStartDate()); - } - MallUserInfo user = getUser(); propertyContract.setTenantId(user.getTenantId()); propertyContract.setAdjustPeriodHandle(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 5adf8153d..c1b756059 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -707,9 +707,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (wxPropertyContract != null) { int receivePeriod = wxPropertyContract.getReceivePeriod().intValue(); Integer lease = wxPropertyContract.getLease(); - Date rentalStartDate = propertyContract.getRentalStartDate(); - if (propertyContract.getRentShopType().equals(EnumRentStartType.STARTTIME.getCode())) { - rentalStartDate = propertyContract.getStartDate(); + Date rentalStartDate = wxPropertyContract.getRentalStartDate(); + System.out.println(wxPropertyContract.getRentStartType().intValue() + "------------------"); + if (wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { + rentalStartDate = wxPropertyContract.getStartDate(); } propertyContract.setRentalStartDate(rentalStartDate); Long price = propertyContract.getPrice();