From 3014f453783f349fabe28339c9b6af096fe80ad6 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 24 Apr 2024 14:01:39 +0800 Subject: [PATCH] fix contract and bill --- .../main/java/com/iformall/domain/po/WxPropertyContract.java | 2 +- .../com/iformall/service/impl/WxBillDepositServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 8b943dd6b..c0dd0ff2e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -40,7 +40,7 @@ public class WxPropertyContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "金额小数点位数", name = "decimalSize") - private Integer decimalSize; + private Integer decimalSize = 2; @io.swagger.annotations.ApiModelProperty(value="商户",name="merchantId") private Long merchantId; /*月租金/分成(分)**/ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 0a192541b..ea0f721c0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -149,7 +149,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { if (deposit.getServiceChargePay() != null) { servicePay = new BigDecimal(deposit.getServiceChargePay()); } else { - servicePay = new BigDecimal(receivePayB).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), decimalSize, BigDecimal.ROUND_HALF_UP); + servicePay = new BigDecimal(receivePayB).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(100), decimalSize, BigDecimal.ROUND_HALF_UP); } BigDecimal realReceivePay = servicePay.add(new BigDecimal(receivePayB)); deposit.setRealReceivePay(realReceivePay.toPlainString());