From b9607d5ab2d833f4acbff33ce687374ca1248db3 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 2 Sep 2019 14:38:48 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E7=A7=9F=E9=87=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxRentContractServiceImpl.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) 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 5dcc9b107..3649892e2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1293,16 +1293,16 @@ public class WxRentContractServiceImpl implements WxRentContractService { needpay = new Double(needpayD).longValue(); }else{ Double priceD = new Double(price); - if (EnumRentContractType.RENT_BY_JOINT.getCode().equals(wxRentContract.getType())) { - //设置跳点率为年周期 price不变 - if (EnumRentContractAdjustRatioWay.CUSTOM.getCode().equals(wxRentContract.getAdjustRatioWay()) || - EnumMissTimeType.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())) { - return priceD.longValue(); - } - //年或者设置跳点率为年周期 除12 - if(EnumMissTimeType.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())){ - priceD = new Double(price)/12; + if (!EnumRentContractAdjustRatioWay.CUSTOM.getCode().equals(wxRentContract.getAdjustRatioWay())) { + //设置跳点率为年周期 price不变 + if (EnumMissTimeType.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())) { + return priceD.longValue(); + } + //年或者设置跳点率为年周期 除12 + if (EnumMissTimeType.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())) { + priceD = new Double(price) / 12; + } } }else{ //年 除12 @@ -1311,6 +1311,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } } + //生成金额直接计算 if(!saveDb){ needpay = new Double(getMonthNeedPay(priceD, startDate, endDate,dayType,receivePeriod)).longValue();