From a966dafb8877552267a94fe8c544c5ea72cf5650 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 16 六月 2025 09:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/account/OrderPaymentService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/account/OrderPaymentService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/account/OrderPaymentService.java
index 7a60bf4..6690a60 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/account/OrderPaymentService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/account/OrderPaymentService.java
@@ -37,10 +37,11 @@
      */
     OrderPayment getByOrderId(String orderId);
 
+    OrderPayment getByUnpaidOrderId(String orderId);
     /**
      *
      * @param outTradeNo
      * @param transactionId
      */
-    void updatePaySuccess(String outTradeNo, String transactionId);
+    void updatePaySuccess(String outTradeNo, BigDecimal feeAmount, String transactionId);
 }

--
Gitblit v1.7.1