From 5b1f10fadd41a5460f5dc61949ece9cd6ab6d9b7 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 10 May 2023 22:03:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E6=97=B6=E8=AE=B0=E5=BD=95=E5=90=8C?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=90=8C=E5=AD=90=E5=8D=95=E6=9C=89=E4=B8=A4?=
 =?UTF-8?q?=E6=9D=A1=EF=BC=9F=E9=BB=98=E8=AE=A4=E5=85=88=E5=8F=96=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=BE=83=E6=99=9A=E5=8D=95=E9=82=A3=E6=9D=A1=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/payment/mapper/OrderFineRecordMapper.java     | 2 +-
 .../payment/service/impl/OrderFineRecordServiceImpl.java  | 8 +++++++-
 .../resources/mapper/financial/OrderFineRecordMapper.xml  | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ghy-payment/src/main/java/com/ghy/payment/mapper/OrderFineRecordMapper.java b/ghy-payment/src/main/java/com/ghy/payment/mapper/OrderFineRecordMapper.java
index 75da3d67..18a83f8f 100644
--- a/ghy-payment/src/main/java/com/ghy/payment/mapper/OrderFineRecordMapper.java
+++ b/ghy-payment/src/main/java/com/ghy/payment/mapper/OrderFineRecordMapper.java
@@ -10,7 +10,7 @@ import java.util.List;
  */
 public interface OrderFineRecordMapper {
 
-    OrderTimeoutRecord selectByDetailIdAndStatus(@Param("orderDetailId") Long orderDetailId, @Param("orderStatus") Integer orderStatus);
+    List<OrderTimeoutRecord> selectByDetailIdAndStatus(@Param("orderDetailId") Long orderDetailId, @Param("orderStatus") Integer orderStatus);
 
     List<OrderTimeoutRecord> selectList(OrderTimeoutRecord orderTimeoutRecord);
 
diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/OrderFineRecordServiceImpl.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/OrderFineRecordServiceImpl.java
index 5fd5c722..becef1cb 100644
--- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/OrderFineRecordServiceImpl.java
+++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/OrderFineRecordServiceImpl.java
@@ -3,6 +3,7 @@ package com.ghy.payment.service.impl;
 import com.ghy.payment.domain.OrderTimeoutRecord;
 import com.ghy.payment.mapper.OrderFineRecordMapper;
 import com.ghy.payment.service.OrderFineRecordService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -21,7 +22,12 @@ public class OrderFineRecordServiceImpl implements OrderFineRecordService {
 
     @Override
     public OrderTimeoutRecord selectByDetailIdAndStatus(Long orderDetailId, Integer orderStatus) {
-        return orderFineRecordMapper.selectByDetailIdAndStatus(orderDetailId, orderStatus);
+        OrderTimeoutRecord orderTimeoutRecord = null;
+        List<OrderTimeoutRecord> orderTimeoutRecords = orderFineRecordMapper.selectByDetailIdAndStatus(orderDetailId, orderStatus);
+        if (CollectionUtils.isNotEmpty(orderTimeoutRecords)) {
+            orderTimeoutRecord = orderTimeoutRecords.get(0);
+        }
+        return orderTimeoutRecord;
     }
 
     @Override
diff --git a/ghy-payment/src/main/resources/mapper/financial/OrderFineRecordMapper.xml b/ghy-payment/src/main/resources/mapper/financial/OrderFineRecordMapper.xml
index d539929d..8b71fa33 100644
--- a/ghy-payment/src/main/resources/mapper/financial/OrderFineRecordMapper.xml
+++ b/ghy-payment/src/main/resources/mapper/financial/OrderFineRecordMapper.xml
@@ -22,7 +22,7 @@
 
     <select id="selectByDetailIdAndStatus" resultMap="OrderFineRecordResult">
         <include refid="selectOrderFineRecord"/>
-        WHERE order_detail_id = #{orderDetailId} AND order_status = #{orderStatus}
+        WHERE order_detail_id = #{orderDetailId} AND order_status = #{orderStatus} order by create_time desc
     </select>
 
     <select id="selectList" parameterType="com.ghy.payment.domain.OrderTimeoutRecord"