diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberAdapayRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberAdapayRecordServiceImpl.java index 4a35c1a5a..3efdd0060 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberAdapayRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberAdapayRecordServiceImpl.java @@ -197,7 +197,7 @@ public class MemberAdapayRecordServiceImpl implements MemberAdapayRecordService return; } // 更新冻结金额 = 目前冻结的金额 - 需要解冻的金额 - record.setFreezeAmt(record.getFreezeAmt().subtract(freezeAmount)); + record.setFreezeAmt(record.getFreezeAmt().add(freezeAmount)); // 更新此笔交易单的剩余金额 = 支付金额 - 累计退款金额 - 累计消费金额 - 累计冻结金额 BigDecimal balanceAmt = record.getPayAmt().subtract(record.getRefundAmt()).subtract(record.getSpendAmt()).subtract(record.getFreezeAmt()); record.setBalanceAmt(balanceAmt); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index 6a30f568d..bd7eb576d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -145,7 +145,7 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { String withdrawStatus = null; if (StringUtils.equals(clearingBillVO.getWithdrawStatus(), "0")) { withdrawStatus = "处理中"; - } else { + } else if (StringUtils.equals(clearingBillVO.getWithdrawStatus(), "1")){ withdrawStatus = "已提现"; } vo.setWithdrawStatus(withdrawStatus);