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 b143e70b3..062701cce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1264,23 +1264,20 @@ public class WxRentContractServiceImpl implements WxRentContractService { }else{ Double priceD = new Double(price); - //年 除12 - if(EnumPriceUnit.Y.getCode().equals(wxRentContract.getPriceUnit())){ - priceD = new Double(price)/12; - } - if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { + if (EnumRentContractType.RENT_BY_JOINT.getCode().equals(wxRentContract.getType())) { //设置跳点率为年周期 price不变 if(EnumMissTimeType.PERIOD.getCode().equals(wxRentContract.getBusDiscountTime())){ - if(i == billTimeVoListSize - 1){ - priceD = new Double(price); - }else { - return priceD.longValue(); - } + return priceD.longValue(); } //年或者设置跳点率为年周期 除12 if(EnumMissTimeType.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())){ priceD = new Double(price)/12; } + }else{ + //年 除12 + if(EnumPriceUnit.Y.getCode().equals(wxRentContract.getPriceUnit())){ + priceD = new Double(price)/12; + } } //生成金额直接计算 @@ -1291,7 +1288,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); SimpleDateFormat sdD = new SimpleDateFormat("d"); - SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); if(i == billTimeVoListSize - 1){//最后 //判断是否满足整月