Просмотр исходного кода

[合同][修改][开发账单结算]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
7893cbed31
1 измененных файлов: 6 добавлений и 6 удалений
  1. +6
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 6
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

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


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


@@ -321,13 +321,13 @@ public class WxRentContractServiceImpl implements WxRentContractService {
ratioVo.setRatio(ratio); ratioVo.setRatio(ratio);


//计算超出部分 //计算超出部分
BigDecimal payRatio = new BigDecimal(ratio).divide(new BigDecimal(10000)).setScale(10, RoundingMode.HALF_EVEN);;
BigDecimal payRatio = new BigDecimal(ratio).divide(new BigDecimal(10000));
BigDecimal balance = new BigDecimal(revenueLong).subtract(end.multiply(new BigDecimal(1000000))); BigDecimal balance = new BigDecimal(revenueLong).subtract(end.multiply(new BigDecimal(1000000)));
BigDecimal price = balance.multiply(payRatio).setScale(2, RoundingMode.HALF_EVEN); BigDecimal price = balance.multiply(payRatio).setScale(2, RoundingMode.HALF_EVEN);


array = ratioList.get(i-1).split(":"); array = ratioList.get(i-1).split(":");
Integer frontatio = Integer.parseInt(array[1]); Integer frontatio = Integer.parseInt(array[1]);
BigDecimal frontRatio = new BigDecimal(frontatio).divide(new BigDecimal(10000)).setScale(10, RoundingMode.HALF_EVEN);;
BigDecimal frontRatio = new BigDecimal(frontatio).divide(new BigDecimal(10000));
BigDecimal frontPrice = end.multiply(new BigDecimal(1000000).multiply(frontRatio).setScale(2, RoundingMode.HALF_EVEN)); BigDecimal frontPrice = end.multiply(new BigDecimal(1000000).multiply(frontRatio).setScale(2, RoundingMode.HALF_EVEN));


ratioVo.setBalance(price.add(frontPrice)); ratioVo.setBalance(price.add(frontPrice));


Загрузка…
Отмена
Сохранить