From 870699ce0e76a37e2c641db418740746807b5e2d Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 29 Aug 2019 11:39:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B4=A6=E5=8D=95=E7=BB=93=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/WxRentContractController.java | 14 +++++++++++++- .../service/impl/WxRentContractServiceImpl.java | 2 +- 2 files changed, 14 insertions(+), 2 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 74650727f..f15388d9f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -130,7 +130,9 @@ public class WxRentContractController extends BaseController { @SystemControllerLog(description = "租赁合同-添加") public ResultData add(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::add"); - + if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ + wxRentContract.setBusDiscountTime(new Integer(0)); + } WxMerchant wxMerchant = new WxMerchant(); wxMerchant.setName(wxRentContract.getMerchantName()); wxMerchant.setId(wxRentContract.getMerchantId()); @@ -169,6 +171,10 @@ public class WxRentContractController extends BaseController { @SystemControllerLog(description = "租赁合同-更新") public ResultData update(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::update"); + + if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ + wxRentContract.setBusDiscountTime(new Integer(0)); + } MallUserInfo user = getUser(); wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); @@ -195,6 +201,9 @@ public class WxRentContractController extends BaseController { @SystemControllerLog(description = "租赁合同-更新金额") public ResultData updateMoney(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateMoney"); + if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ + wxRentContract.setBusDiscountTime(new Integer(0)); + } MallUserInfo user = getUser(); wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); @@ -210,6 +219,9 @@ public class WxRentContractController extends BaseController { @SystemControllerLog(description = "租赁合同-更新文件") public ResultData updateFile(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateFile"); + if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ + wxRentContract.setBusDiscountTime(new Integer(0)); + } MallUserInfo user = getUser(); wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); 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 062701cce..2a78cc6c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1270,7 +1270,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { return priceD.longValue(); } //年或者设置跳点率为年周期 除12 - if(EnumMissTimeType.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())){ + if(saveDb && EnumMissTimeType.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())){ priceD = new Double(price)/12; } }else{