From 138078a5cff2af44c0f72a52416463f81164e580b6c9e6df4269d4e592deea55 Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Fri, 14 Nov 2025 20:48:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0=E4=B8=BAlo?=
 =?UTF-8?q?ng=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/service/impl/EbikeWxPayServiceImpl.java    | 10 +++++-----
 .../src/main/java/com/cdzy/payment/task/WxPayTask.java |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeWxPayServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeWxPayServiceImpl.java
index e68f190..d239b9a 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeWxPayServiceImpl.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeWxPayServiceImpl.java
@@ -116,7 +116,7 @@ public class EbikeWxPayServiceImpl implements EbikeWxPayService {
             if (Transaction.TradeStateEnum.NOTPAY.ordinal() == tradeStatus
                     || Transaction.TradeStateEnum.USERPAYING.ordinal() == tradeStatus) {
                 // 检查订单是否关闭
-                Transaction t = queryOrderByOutTradeNo(ebikePayment.getTradeId().toString());
+                Transaction t = queryOrderByOutTradeNo(String.valueOf(ebikePayment.getTradeId()));
                 if (t != null && Transaction.TradeStateEnum.CLOSED.equals(t.getTradeState())) {
                     // 验证是否存在支付成功但状态未同步的情况
                     EbikeWxHandleNotifyVo hr = queryOrderStatusByOrderId(ebikePayment);
@@ -178,7 +178,7 @@ public class EbikeWxPayServiceImpl implements EbikeWxPayService {
         EbikePaymentAmountVo amount = paymentVo.getAmount();
         EbikePaymentDetailVo detail = paymentVo.getDetail();
 
-        String tradeId = ebikePayment == null ? outTradeNo : ebikePayment.getTradeId().toString();
+        String tradeId = ebikePayment == null ? outTradeNo : String.valueOf(ebikePayment.getTradeId());
         try {
             PrepayRequest request = new PrepayRequest();
             request.setAppid(wxPayConfig.getAppId());
@@ -303,7 +303,7 @@ public class EbikeWxPayServiceImpl implements EbikeWxPayService {
             log.error("{}支付订单不存在!", orderId);
             return null;
         }
-        return queryOrderByOutTradeNo(ebikePayment.getTradeId().toString());
+        return queryOrderByOutTradeNo(String.valueOf(ebikePayment.getTradeId()));
     }
 
     @Override
@@ -334,7 +334,7 @@ public class EbikeWxPayServiceImpl implements EbikeWxPayService {
      */
     private EbikeWxHandleNotifyVo queryOrderStatusByOrderId(EbikePayment ebikePayment) {
         EbikeWxHandleNotifyVo result = new EbikeWxHandleNotifyVo();
-        Transaction r = queryOrderByOutTradeNo(ebikePayment.getTradeId().toString());
+        Transaction r = queryOrderByOutTradeNo(String.valueOf(ebikePayment.getTradeId()));
         if (r != null && Transaction.TradeStateEnum.SUCCESS.equals(r.getTradeState())) {
             result.setMessage(String.format("订单%s支付成功", ebikePayment.getOrderId()));
             result.setSuccess(true);
@@ -414,7 +414,7 @@ public class EbikeWxPayServiceImpl implements EbikeWxPayService {
         // 发起退款
         CreateRequest request = new CreateRequest();
         request.setTransactionId(transactionId);
-        request.setOutTradeNo(ebikePayment.getTradeId().toString());
+        request.setOutTradeNo(String.valueOf(ebikePayment.getTradeId()));
         request.setOutRefundNo(ebikeRefund.getRefundOrderId());
         request.setReason(ebikeRefund.getReason());
         request.setNotifyUrl(wxPayConfig.getRefundNotifyUrl());
diff --git a/ebike-payment/src/main/java/com/cdzy/payment/task/WxPayTask.java b/ebike-payment/src/main/java/com/cdzy/payment/task/WxPayTask.java
index 083b5f7..ca6f88a 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/task/WxPayTask.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/task/WxPayTask.java
@@ -48,7 +48,7 @@ public class WxPayTask {
         for (EbikePayment ebikePayment : ebikePaymentList) {
             log.warn("未支付的订单号 ===> {}", ebikePayment.getOrderId());
             // 调用微信支付查询接口，查询支付状态
-            Transaction transaction = wxPayService.queryOrderByOutTradeNo(ebikePayment.getTradeId().toString());
+            Transaction transaction = wxPayService.queryOrderByOutTradeNo(String.valueOf(ebikePayment.getTradeId()));
             // 3. 更新订单状态
             if (transaction != null) {
                 ebikePaymentService.updatePaymentStatus(transaction);
@@ -67,7 +67,7 @@ public class WxPayTask {
         for (EbikePayment ebikePayment : ebikePaymentList) {
             log.warn("超时未支付的订单号 ===> {}", ebikePayment.getOrderId());
             // 调用微信支付关闭接口，关闭订单
-            boolean close = wxPayService.closeOrder(ebikePayment.getTradeId().toString());
+            boolean close = wxPayService.closeOrder(String.valueOf(ebikePayment.getTradeId()));
             if (close) {
                 // 3. 更新订单状态
                 Transaction transaction = new Transaction();