Explorar el Código

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

release_toaliyun_real
luozukai hace 6 años
padre
commit
017779c64b
Se han modificado 1 ficheros con 4 adiciones y 4 borrados
  1. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Ver fichero

@@ -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));
}
}



Cargando…
Cancelar
Guardar