winter 2 лет назад
Родитель
Сommit
0da805c3b7
1 измененных файлов: 10 добавлений и 10 удалений
  1. +10
    -10
      mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java

+ 10
- 10
mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java Просмотреть файл

@@ -384,7 +384,7 @@ public class WxRentContractHelper {
//取整
//needpay = new Double(needpayD).longValue();
//四舍五入
needpay = new BigDecimal(needpayD).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
needpay = new BigDecimal(needpayD).setScale(wxRentContract.getDecimalSize(), RoundingMode.HALF_UP).toPlainString();
}else{
BigDecimal priceD = new BigDecimal(price);
if (EnumRentContractType.RENT_BY_JOINT.getCode().equals(wxRentContract.getType())) {
@@ -407,7 +407,7 @@ public class WxRentContractHelper {
//生成金额直接计算
if(!saveDb){
//needpay = new Double(getMonthNeedPay(priceD, startDate, endDate,dayType,receivePeriod,part)).longValue();
needpay = new BigDecimal(getMonthNeedPay(Constant.default_long_decimal_size,priceD, startDate, endDate,dayType,receivePeriod,part)).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
needpay = new BigDecimal(getMonthNeedPay(Constant.default_long_decimal_size,priceD, startDate, endDate,dayType,receivePeriod,part)).setScale(wxRentContract.getDecimalSize(), RoundingMode.HALF_UP).toPlainString();
return needpay;
}

@@ -422,22 +422,22 @@ public class WxRentContractHelper {
instance.add(Calendar.DATE, -1);
if(sd.format(instance.getTime()).equals(sd.format(endDate))){
int months = WxRentContractHelper.getMonths(sdM.format(startDate)+"-01",sdM.format(DateUtils.getDaySet(endDate,Calendar.DATE,1))+"-01");
needpay = new BigDecimal(months).multiply(priceD).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
needpay = new BigDecimal(months).multiply(priceD).setScale(wxRentContract.getDecimalSize(), RoundingMode.HALF_UP).toPlainString();
}else{
//needpay = new Double(getMonthNeedPay(priceD, startDate, endDate,dayType,receivePeriod,false)).longValue();
needpay = new BigDecimal(getMonthNeedPay(Constant.default_long_decimal_size,priceD, startDate, endDate,dayType,receivePeriod,false))
.setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
.setScale(wxRentContract.getDecimalSize(), RoundingMode.HALF_UP).toPlainString();
}
}else if(i == 0){//第一期
if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){
if(isFirstDay(startDate)){
int months = WxRentContractHelper.getMonths(sdM.format(startDate)+"-01",sdM.format(endDate)+"-01");
months++;
needpay = new BigDecimal(months).multiply(priceD).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
needpay = new BigDecimal(months).multiply(priceD).setScale(wxRentContract.getDecimalSize(), RoundingMode.HALF_UP).toPlainString();
}else{
//needpay = new Double(getMonthNeedPay(priceD, startDate, endDate,dayType,receivePeriod,false)).longValue();
needpay = new BigDecimal(getMonthNeedPay(Constant.default_long_decimal_size,priceD, startDate, endDate,dayType,receivePeriod,false))
.setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
.setScale(wxRentContract.getDecimalSize(), RoundingMode.HALF_UP).toPlainString();
}
}else{
if(isFirstDay(startDate)){
@@ -445,11 +445,11 @@ public class WxRentContractHelper {
if(isFirstDay(startDate)){
months++;
}
needpay = new BigDecimal(months).multiply(priceD).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
needpay = new BigDecimal(months).multiply(priceD).setScale(wxRentContract.getDecimalSize(), RoundingMode.HALF_UP).toPlainString();
}else{
//needpay = new Double(getMonthNeedPay(priceD, startDate, endDate,dayType,receivePeriod,false)).longValue();
needpay = new BigDecimal(getMonthNeedPay(Constant.default_long_decimal_size,priceD, startDate, endDate,dayType,receivePeriod,false))
.setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
.setScale(wxRentContract.getDecimalSize(), RoundingMode.HALF_UP).toPlainString();
}
}
}else{//中间
@@ -461,9 +461,9 @@ public class WxRentContractHelper {
if (monthCalDay) {
//needpay = new Double(getMonthNeedPay(priceD, startDate, endDate,dayType,receivePeriod,false)).longValue();
needpay = new BigDecimal(getMonthNeedPay(Constant.default_long_decimal_size,priceD, startDate, endDate,dayType,receivePeriod,false))
.setScale(Constant.default_long_decimal_size, BigDecimal.ROUND_HALF_UP).toPlainString();
.setScale(wxRentContract.getDecimalSize(), BigDecimal.ROUND_HALF_UP).toPlainString();
}else {
needpay = new BigDecimal(months).multiply(priceD).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
needpay = new BigDecimal(months).multiply(priceD).setScale(wxRentContract.getDecimalSize(), RoundingMode.HALF_UP).toPlainString();
}
}
}


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