From ff06f110175421986d2ca57218875f9d33b159f9 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 4 Jun 2024 09:57:16 +0800 Subject: [PATCH] fix --- .../src/main/java/com/iformall/domain/po/WxBillRent.java | 8 ++++++++ .../iformall/service/impl/WxRentContractServiceImpl.java | 1 + 2 files changed, 9 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index df1f6080e..167193121 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -15,6 +15,7 @@ import lombok.ToString; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Date; import java.util.List; @@ -199,5 +200,12 @@ public class WxBillRent extends WxBillBaseEntity { @TableField(exist = false) private List rentContractIdList; + + @TableField(exist = false) + private String totalFee; + public void calcuteTotalFee(Integer decimalSize) { + this.totalFee = new BigDecimal(this.receivePay).add(new BigDecimal(bussinessManageFeeNeedPay)).add(new BigDecimal(operatingManageFeeNeedPay)) + .setScale(decimalSize, 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 cd2fe2c4d..1bda563e8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1616,6 +1616,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillRent.setPeriod(++billcount); wxBillRent.setShopInfo(shopInfoStr); wxBillRent.setLatePayRatio(0); + wxBillRent.calcuteTotalFee(wxRentContract.getDecimalSize()); //计算手续费 BigDecimal servicePay = new BigDecimal(wxBillRent.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate()))