From 62b698dc598e336d4958be3042b047ac48f2c656 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 2 Sep 2023 11:09:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E8=AE=A2=E5=8D=95=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=94=B9=E9=80=A0=E5=B7=A5=E5=8E=82=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit bbf2e914f10e37f5d5f14084d63599973adda43d) --- .../pile/service/impl/MemberAdapayRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); From 93d4128a0da5755ec728ccc63a9a3b9f69bdb70e Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 4 Sep 2023 12:00:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E6=8F=90=E7=8E=B0=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/service/impl/SettleOrderReportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);