From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期五, 04 七月 2025 20:39:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/account/OrderPaymentServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/account/OrderPaymentServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/account/OrderPaymentServiceImpl.java index 8625cba..3477bcf 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/account/OrderPaymentServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/account/OrderPaymentServiceImpl.java @@ -68,11 +68,12 @@ } @Override - public void updatePaySuccess(String outTradeNo, String transactionId) { + public void updatePaySuccess(String outTradeNo, BigDecimal feeAmount, String transactionId) { LambdaUpdateWrapper<OrderPayment> updateWrapper = Wrappers.lambdaUpdate(); updateWrapper.eq(OrderPayment::getOutTradeNo, outTradeNo) .set(OrderPayment::getPayStatus, 2) .set(OrderPayment::getTransactionId, transactionId) + .set(OrderPayment::getFeeAmount, feeAmount) .set(OrderPayment::getBackTime, new Date()); this.update(updateWrapper); } -- Gitblit v1.7.1