Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
e44cdbf84c
2 changed files with 8 additions and 8 deletions
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java
  2. +6
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java View File

@@ -166,7 +166,7 @@ public class WxRentContractHelper {
if (wxRentContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.RATIO.getCode())) {
for (int i = 1; i < size; i++) {
BigDecimal divide = priceD.multiply(new BigDecimal(integers.get(i))).divide(new BigDecimal(10000));
BigDecimal divide = priceD.multiply(new BigDecimal(integers.get(i))).divide(new BigDecimal(100));
priceD = priceD.add(divide);
priceArrs[i] = priceD.setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
}
@@ -186,7 +186,7 @@ public class WxRentContractHelper {
if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode()) && revenueYears.size() == size) {
_p = new BigDecimal(revenueYears.get(i)).multiply(new BigDecimal(integers.get(i))).divide(new BigDecimal(10000));
}else {
_p = priceD.multiply(new BigDecimal(integers.get(i))).divide(new BigDecimal(10000));
_p = priceD.multiply(new BigDecimal(integers.get(i))).divide(new BigDecimal(100));
}
priceArrs[i] = _p.setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
}


+ 6
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -819,12 +819,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillDeposit.setPriceDetail("合同押金项["+fees.getName()+"]"+depositFee.getPrice()+"元"+"/"+fees.getCalcuteUnitName());
}
wxBillDeposit.setPay("0");
//String needpay = wxRentContract.getDeposit();
String count = "1";
if (null != depositFee.getCalcuteUnit() && depositFee.getCalcuteUnit().intValue() == EnumFeesStandardsCalcuteUnit.MM.getCode().intValue()) {
count = wxRentContract.getRentArea();
}
String needpay = depositFee.calcuteTotalMoney(wxRentContract.getDecimalSize(), null, null, count, true, null, null);
String needpay = wxRentContract.getDeposit();
// String count = "1";
// if (null != depositFee.getCalcuteUnit() && depositFee.getCalcuteUnit().intValue() == EnumFeesStandardsCalcuteUnit.MM.getCode().intValue()) {
// count = wxRentContract.getRentArea();
// }
// String needpay = depositFee.calcuteTotalMoney(wxRentContract.getDecimalSize(), null, null, count, true, null, null);
wxBillDeposit.setReceivePay(needpay);
wxBillDeposit.setNeedPay(needpay);
//wxBillDeposit.setOwe(needpay);


Loading…
Cancel
Save