autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-08 12:00:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into merge_adapay

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-09-04 14:19:08 +08:00
parent fbe05c8c6b 93d4128a0d
commit cd31278b64
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberAdapayRecordServiceImpl.java
View File

@@ -197,7 +197,7 @@ public class MemberAdapayRecordServiceImpl implements MemberAdapayRecordService
return; 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()); BigDecimal balanceAmt = record.getPayAmt().subtract(record.getRefundAmt()).subtract(record.getSpendAmt()).subtract(record.getFreezeAmt());
record.setBalanceAmt(balanceAmt); record.setBalanceAmt(balanceAmt);

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -145,7 +145,7 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
String withdrawStatus = null; String withdrawStatus = null;
if (StringUtils.equals(clearingBillVO.getWithdrawStatus(), "0")) { if (StringUtils.equals(clearingBillVO.getWithdrawStatus(), "0")) {
withdrawStatus = "处理中"; withdrawStatus = "处理中";
} else { } else if (StringUtils.equals(clearingBillVO.getWithdrawStatus(), "1")){
withdrawStatus = "已提现"; withdrawStatus = "已提现";
} }
vo.setWithdrawStatus(withdrawStatus); vo.setWithdrawStatus(withdrawStatus);