From b5402cbef7799e0e5f4c8e90e136625be0e11b72 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 7 Aug 2019 15:40:00 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=A7=88=E8=B4=A6=E5=8D=95=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/contract/WxPropertyContractController.java | 3 +++ .../controller/contract/WxRentContractController.java | 4 ++++ 2 files changed, 7 insertions(+) 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 8f9fe1935..3e9f6a5df 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -191,6 +191,9 @@ public class WxPropertyContractController extends BaseController { logger.debug("[" + getIpAddr() + "] WxRentContractController::buildBillPriceList"); WxPropertyContract dbRent = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); dbRent.setPreviewBillRentList(wxPropertyContract.getPreviewBillRentList()); + if(dbRent.getRentStartType()!=null && dbRent.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + dbRent.setRentalStartDate(dbRent.getStartDate()); + } List result = wxPropertyContractService.buildProperty(new WxMerchant(),getUserId(),dbRent, EnumIsPreview.YES.getCode(), false); return new ResultData(result); } 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 6be4e6f0c..be88a5490 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -114,6 +114,10 @@ public class WxRentContractController extends BaseController { logger.debug("[" + getIpAddr() + "] WxRentContractController::buildBillPriceList"); WxRentContract dbRent = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); dbRent.setPreviewBillRentList(wxRentContract.getPreviewBillRentList()); + + if(dbRent.getRentStartType()!=null && dbRent.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + dbRent.setRentalStartDate(dbRent.getStartDate()); + } List result = wxRentContractService.buildRent(new WxMerchant(),getUserId(),dbRent, EnumIsPreview.YES.getCode(), false); return new ResultData(result); }