From 043642f1b11de0bd8811f033e36981a8ffd4b2a2 Mon Sep 17 00:00:00 2001
From: jkcdev <dingchao@jkcchina.com>
Date: Thu, 22 May 2025 13:54:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E6=AC=BE=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E6=97=B6=E9=97=B4=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=B9=B3=E5=8F=B0=E8=BF=94=E5=9B=9E=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=80=80=E6=AC=BE=E6=88=90=E5=8A=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=AD=A3=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EbikePaymentServiceImpl.java |  9 +++++----
 .../service/impl/EbikeRefundServiceImpl.java  | 20 +++++++++++++++++--
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java
index 8c6fa2a3..a86ee496 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java
@@ -90,10 +90,11 @@ public class EbikePaymentServiceImpl extends ServiceImpl<EbikePaymentMapper, Ebi
     @Override
     public Map getOrderDetail(String orderId) {
         QueryWrapper query = QueryWrapper.create()
-                .select(EBIKE_PAYMENT.COST_PRICE.as("totalAmount"), EBIKE_PAYMENT.TOTAL.as("actualAmount"),EBIKE_USER_ORDERS.BIKE_CODE.as("bikeCode"),
-                        EBIKE_USER_ORDERS.ORDER_ID.as("orderId"), EBIKE_USER_ORDERS.BIKE_CODE, EBIKE_USER_ORDERS.CREATED_AT.as("unLockTime"),
-                        EBIKE_USER_ORDERS.END_TIME.as("lockTime"), EBIKE_USER_ORDERS.CREATED_AT.as("createTime"),
-                        EBIKE_USER_ORDERS.END_TIME.as("endTime"), EBIKE_USER.NICKNAME.as("userName"), EBIKE_USER.MOBILE.as("phone"),
+                .select(EBIKE_PAYMENT.COST_PRICE.as("totalAmount"), EBIKE_PAYMENT.TOTAL.as("actualAmount"),
+                        EBIKE_USER_ORDERS.ORDER_ID.as("orderId"), EBIKE_USER_ORDERS.BIKE_CODE.as("bikeCode"),
+                        EBIKE_USER_ORDERS.START_TIME.as("unLockTime"), EBIKE_USER_ORDERS.END_TIME.as("lockTime"),
+                        EBIKE_USER_ORDERS.CREATED_AT.as("createTime"), EBIKE_USER_ORDERS.END_TIME.as("endTime"),
+                        EBIKE_USER.NICKNAME.as("userName"), EBIKE_USER.MOBILE.as("phone"),
                         EBIKE_USER_ORDERS.RIDE_POINT.as("borrowCarCoordinate"), EBIKE_USER_ORDERS.RETURN_POINT.as("returnCarCoordinate"),
                         EBIKE_PAYMENT.PAYMENT_TIME.as("payTime"), QueryMethods.case_(EBIKE_PAYMENT.PAYMENT_METHOD)
                                 .when(PayMethod.wechat.name()).then("微信支付")
diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java
index e8766d46..171c37bc 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java
@@ -2,6 +2,7 @@ package com.cdzy.payment.service.impl;
 
 import com.cdzy.payment.model.dto.*;
 import com.cdzy.payment.model.enums.PayMethod;
+import com.cdzy.payment.utils.StringUtils;
 import com.ebike.feign.clients.OrdersFeignClient;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryMethods;
@@ -66,12 +67,27 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
         return getOne(query);
     }
 
+    /**
+     * 通过退款订单号查询退款记录
+     *
+     * @param refundOrderId 退款订单号
+     * @return 退款记录
+     */
+    private EbikeRefund getByRefundOrderId(String refundOrderId) {
+        // create_time到排序，取最新的一条
+        QueryWrapper query = QueryWrapper.create()
+                .where(EBIKE_REFUND.REFUND_ORDER.eq(refundOrderId))
+                .orderBy(EBIKE_REFUND.CREATE_TIME.desc());
+        return getOne(query);
+    }
+
     @Override
     public Boolean updateRefundStatus(Refund refund) {
-        EbikeRefund ebikeRefund = getByOrderId(refund.getOutTradeNo());
+        EbikeRefund ebikeRefund = getByRefundOrderId(refund.getOutRefundNo());
         ebikeRefund.setStatus(String.valueOf(refund.getStatus().ordinal()));
         if (Status.SUCCESS.equals(refund.getStatus())) {
-            ebikeRefund.setRefundTime(LocalDateTime.now());
+            String refundTime = refund.getSuccessTime();
+            ebikeRefund.setRefundTime(StringUtils.toLocalDatetime(refundTime));
             ebikeRefund.setRefund(refund.getAmount().getRefund().doubleValue() / 100.0);
         }
         long orderId = Long.parseLong(refund.getOutTradeNo());