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();