From e44cdbf84c4a08f0171d70bec5df541620e8308f Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 6 Aug 2024 18:22:32 +0800 Subject: [PATCH] fix --- .../service/helper/WxRentContractHelper.java | 4 ++-- .../service/impl/WxRentContractServiceImpl.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java index ff05b076b..cb00818ef 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java @@ -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(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index ed2d7fcc5..618dab41f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -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);