Przeglądaj źródła

fix contract and bill

release_toaliyun_real
winter 2 lat temu
rodzic
commit
3014f45378
2 zmienionych plików z 2 dodań i 2 usunięć
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java Wyświetl plik

@@ -40,7 +40,7 @@ public class WxPropertyContract extends TenantEntity {




@io.swagger.annotations.ApiModelProperty(value = "金额小数点位数", name = "decimalSize") @io.swagger.annotations.ApiModelProperty(value = "金额小数点位数", name = "decimalSize")
private Integer decimalSize;
private Integer decimalSize = 2;
@io.swagger.annotations.ApiModelProperty(value="商户",name="merchantId") @io.swagger.annotations.ApiModelProperty(value="商户",name="merchantId")
private Long merchantId; private Long merchantId;
/*月租金/分成(分)**/ /*月租金/分成(分)**/


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java Wyświetl plik

@@ -149,7 +149,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService {
if (deposit.getServiceChargePay() != null) { if (deposit.getServiceChargePay() != null) {
servicePay = new BigDecimal(deposit.getServiceChargePay()); servicePay = new BigDecimal(deposit.getServiceChargePay());
} else { } 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)); BigDecimal realReceivePay = servicePay.add(new BigDecimal(receivePayB));
deposit.setRealReceivePay(realReceivePay.toPlainString()); deposit.setRealReceivePay(realReceivePay.toPlainString());


Ładowanie…
Anuluj
Zapisz