From c76ba6dea0336efee08e0b4098d07df2142dcb6c Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 28 Aug 2023 10:28:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=9A=E5=91=98=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E8=AE=B0=E5=BD=95=E7=9A=84=E5=86=BB=E7=BB=93=E9=87=91?= =?UTF-8?q?=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/MemberAdapayRecordService.java | 2 +- .../impl/MemberAdapayRecordServiceImpl.java | 17 +++++------------ .../service/impl/OrderBasicInfoServiceImpl.java | 4 ++-- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberAdapayRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberAdapayRecordService.java index f44e228fa..af917f6a7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberAdapayRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberAdapayRecordService.java @@ -36,5 +36,5 @@ public interface MemberAdapayRecordService{ void updateFreezeAmount(String paymentId, BigDecimal amount); - void updateSpendAmountAndRefundAmount(String paymentId, BigDecimal SpendAmount, BigDecimal RefundAmount, BigDecimal freezeAmount); + void updateSpendAmountAndRefundAmountAndFreezeAmount(String paymentId, BigDecimal SpendAmount, BigDecimal RefundAmount, BigDecimal freezeAmount); } 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 0f53cbfd9..4d7bf5ca3 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 @@ -82,34 +82,26 @@ public class MemberAdapayRecordServiceImpl implements MemberAdapayRecordService /** * 更新消费金额 - * - * @param paymentId - * @param amount */ @Override public void updateSpendAmount(String paymentId, BigDecimal amount) { - updateSpendAmountAndRefundAmount(paymentId, amount, null, null); + updateSpendAmountAndRefundAmountAndFreezeAmount(paymentId, amount, null, null); } /** * 更新剩余金额 - * - * @param paymentId - * @param amount */ @Override public void updateRefundAmount(String paymentId, BigDecimal amount) { - updateSpendAmountAndRefundAmount(paymentId, null, amount, null); + updateSpendAmountAndRefundAmountAndFreezeAmount(paymentId, null, amount, null); } /** * 更新冻结金额 - * @param paymentId - * @param amount */ @Override public void updateFreezeAmount(String paymentId, BigDecimal amount) { - updateSpendAmountAndRefundAmount(paymentId, null, null, amount); + updateSpendAmountAndRefundAmountAndFreezeAmount(paymentId, null, null, amount); } /** @@ -118,9 +110,10 @@ public class MemberAdapayRecordServiceImpl implements MemberAdapayRecordService * @param paymentId 支付id * @param SpendAmount 消费金额 * @param RefundAmount 退款金额 + * @param freezeAmount 冻结金额 */ @Override - public void updateSpendAmountAndRefundAmount(String paymentId, BigDecimal SpendAmount, BigDecimal RefundAmount, BigDecimal freezeAmount) { + public void updateSpendAmountAndRefundAmountAndFreezeAmount(String paymentId, BigDecimal SpendAmount, BigDecimal RefundAmount, BigDecimal freezeAmount) { MemberAdapayRecord record = selectByPaymentId(paymentId); if (record == null) { log.info("更新交易记录的消费金额和退款金额paymentId:{}, 查询为空", paymentId); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 399b6586b..1508647c9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2422,7 +2422,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // record.setBalanceAmt(record.getPayAmt().subtract(record.getRefundAmt()).subtract(record.getSpendAmt())); // memberAdapayRecordService.updateByPrimaryKeySelective(record); - memberAdapayRecordService.updateSpendAmountAndRefundAmount(paymentId, spendAmt, reverseAmt, null); + memberAdapayRecordService.updateSpendAmountAndRefundAmountAndFreezeAmount(paymentId, spendAmt, reverseAmt, null); // if (BigDecimal.ZERO.compareTo(record.getBalanceAmt()) != 0) { // logger.error("订单分账结束后账不平，paymentId:{}, orderCode:{}, 支付金额:{}, 消费金额:{}, 退款金额:{}", // paymentId, dto.getOrderCode(), payAmt, spendAmt, reverseAmt); @@ -2448,7 +2448,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // } // memberAdapayRecordService.updateByPrimaryKeySelective(record); - memberAdapayRecordService.updateSpendAmountAndRefundAmount(paymentId, spendAmt, refundAmt, null); + memberAdapayRecordService.updateSpendAmountAndRefundAmountAndFreezeAmount(paymentId, spendAmt, refundAmt, null); } } // if (StringUtils.equals("", payMode)) {