|
|
|
@@ -278,7 +278,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
end = new BigDecimal(revenueArray[1]).divide(new BigDecimal(365), 10, BigDecimal.ROUND_HALF_DOWN).multiply(new BigDecimal(dayCount)); |
|
|
|
} |
|
|
|
if(EnumGetRatioFrom.RENT.getCode().equals(from)) { |
|
|
|
revenue = revenue.divide(new BigDecimal(12),10, BigDecimal.ROUND_HALF_DOWN); |
|
|
|
revenue = revenue.multiply(new BigDecimal(12)); |
|
|
|
} |
|
|
|
}else if(EnumMissTimeType.MONTH.getCode().equals(timeType)){ |
|
|
|
if(EnumGetRatioFrom.BILL.getCode().equals(from)) { |
|
|
|
@@ -287,7 +287,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
} |
|
|
|
}else if(EnumMissTimeType.PERIOD.getCode().equals(timeType)){ |
|
|
|
if(EnumGetRatioFrom.RENT.getCode().equals(from)) { |
|
|
|
revenue = revenue.divide(new BigDecimal(period),10, BigDecimal.ROUND_HALF_DOWN); |
|
|
|
revenue = revenue.multiply(new BigDecimal(period)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@@ -305,7 +305,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
end = new BigDecimal(revenueArray[1]).divide(new BigDecimal(365), 10, BigDecimal.ROUND_HALF_DOWN).multiply(new BigDecimal(dayCount)); |
|
|
|
} |
|
|
|
if(EnumGetRatioFrom.RENT.getCode().equals(from)) { |
|
|
|
revenue = revenue.divide(new BigDecimal(12),10, BigDecimal.ROUND_HALF_DOWN); |
|
|
|
revenue = revenue.multiply(new BigDecimal(12)); |
|
|
|
} |
|
|
|
}else if(EnumMissTimeType.MONTH.getCode().equals(timeType)){ |
|
|
|
if(EnumGetRatioFrom.BILL.getCode().equals(from)) { |
|
|
|
@@ -313,7 +313,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
} |
|
|
|
}else if(EnumMissTimeType.PERIOD.getCode().equals(timeType)){ |
|
|
|
if(EnumGetRatioFrom.RENT.getCode().equals(from)) { |
|
|
|
revenue = revenue.divide(new BigDecimal(period),10, BigDecimal.ROUND_HALF_DOWN); |
|
|
|
revenue = revenue.multiply(new BigDecimal(period)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|