From e741aa26a9f24360556f8e32615dcd06abcc2c4a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 19 Jun 2019 20:41:04 +0800 Subject: [PATCH] =?UTF-8?q?[Bug][=E4=BF=AE=E6=94=B9][dev=20version:.1486.1?= =?UTF-8?q?952=20=EF=BC=9A=E5=95=86=E9=93=BA=E7=A7=9F=E8=B5=81=E5=90=88?= =?UTF-8?q?=E5=90=8C=EF=BC=9A=E7=94=9F=E6=88=90=E7=89=A9=E4=B8=9A=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E5=88=87=E6=8D=A2=E7=94=9F=E6=88=90=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=E6=97=B6=E9=97=B4=E4=B8=8D=E5=AF=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxPropertyContractController.java | 22 ++++++++++++++----- .../service/WxPropertyContractService.java | 4 +++- .../impl/WxPropertyContractServiceImpl.java | 7 +++++- 3 files changed, 26 insertions(+), 7 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 7b00553d7..d40bf7d3b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.Map; /** @@ -59,11 +60,12 @@ public class WxPropertyContractController extends BaseController { MallUserInfo user = getUser(); wxPropertyContract.setTenantId(user.getTenantId()); wxPropertyContract.setAdjustPeriodHandle(); + Date oldDate = wxPropertyContract.getRentalStartDate(); if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate()); } - return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); + return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), oldDate); } @PostMapping("updateRentStartTime") @@ -72,6 +74,7 @@ public class WxPropertyContractController extends BaseController { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate()); + Date oldDate = wxPropertyContract.getRentalStartDate(); if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ propertyContract.setRentalStartDate(propertyContract.getStartDate()); @@ -81,7 +84,7 @@ public class WxPropertyContractController extends BaseController { propertyContract.setTenantId(user.getTenantId()); propertyContract.setAdjustPeriodHandle(); propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); - return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName()); + return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName(), oldDate); } @@ -89,11 +92,20 @@ public class WxPropertyContractController extends BaseController { @SystemControllerLog(description = "物业合同-修改") public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update"); + WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); + propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate()); + Date oldDate = wxPropertyContract.getRentalStartDate(); + + if (wxPropertyContract.getRentStartType() != null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { + propertyContract.setRentalStartDate(propertyContract.getStartDate()); + } + MallUserInfo user = getUser(); - wxPropertyContract.setTenantId(user.getTenantId()); - wxPropertyContract.setAdjustPeriodHandle(); + propertyContract.setTenantId(user.getTenantId()); + propertyContract.setAdjustPeriodHandle(); + propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); //第三步提交 SWITCH - return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); + return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), oldDate); } @GetMapping("/del") diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 6e845ec8b..64143f7bf 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -6,6 +6,7 @@ import com.iformall.domain.po.WxPropertyContract; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.List; import java.util.Map; @@ -36,9 +37,10 @@ public interface WxPropertyContractService { * 保存或更新实体 * @param record * @param userId + * @param oldDate * @return */ - ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName); + ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName, Date oldDate); /** * 根据Id删除实体 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 4462a78ca..06dbab3a9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -211,7 +211,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override @Transactional(rollbackFor = {Exception.class}) - public ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName) { + public ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName, Date oldDate) { // 保存调整金额(预账单调整) boolean haspreview = false; if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ @@ -318,6 +318,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (wxPropertyContract == null) { return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); } + record.setRentalStartDate(wxPropertyContract.getRentalStartDate()); record.setRentalEndDate(wxRentContract.getRentalEndDate()); record.setStartDate(wxRentContract.getStartDate()); @@ -707,6 +708,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService int receivePeriod = wxPropertyContract.getReceivePeriod().intValue(); Integer lease = wxPropertyContract.getLease(); Date rentalStartDate = propertyContract.getRentalStartDate(); + if (propertyContract.getRentShopType().equals(EnumRentStartType.STARTTIME.getCode())) { + rentalStartDate = propertyContract.getStartDate(); + } + propertyContract.setRentalStartDate(rentalStartDate); Long price = propertyContract.getPrice(); //按月计租