From 8e58808c6861f6cd548872b910551d3624df259e Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Mon, 30 Dec 2024 17:00:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B9=E6=B3=95=20?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20=E6=9C=AA=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/service/OrderBasicInfoService.java   |  2 ++
 .../impl/OrderBasicInfoServiceImpl.java       | 21 +++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
index 1f1a4b859..0aefbb3bd 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
@@ -239,6 +239,8 @@ public interface OrderBasicInfoService{
      */
     List<IndexOrderInfoVO> getIndexOrderInfo(IndexQueryDTO dto);
 
+    List<OrderBasicInfo> getUnpaidOrderList(String startTime, String endTime);
+
     /**
      * 获取超过15分钟的待支付状态订单
      * @return
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 9a2b6b808..dc02ad8b1 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -2112,6 +2112,18 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         return resultList;
     }
 
+    /**
+     * 根据时间范围查询 未支付订单
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    @Override
+    public List<OrderBasicInfo> getUnpaidOrderList(String startTime, String endTime) {
+        List<OrderBasicInfo> list = orderBasicInfoMapper.getUnpaidOrderList(startTime, endTime);
+        return CollectionUtils.isNotEmpty(list) ? list : Lists.newArrayList();
+    }
+
     /**
      * 获取超过15分钟的待支付状态订单
      *
@@ -2119,10 +2131,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
      */
     @Override
     public List<OrderBasicInfo> getUnpaidOrderListOver15Min() {
-        String startString = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-        String endString = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinute(new Date(), -15));
-        List<OrderBasicInfo> list = orderBasicInfoMapper.getUnpaidOrderList(startString, endString);
-        return CollectionUtils.isNotEmpty(list) ? list : Lists.newArrayList();
+        String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinute(new Date(), -15));
+        String endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
+        // List<OrderBasicInfo> list = orderBasicInfoMapper.getUnpaidOrderList(startString, endString);
+        // return CollectionUtils.isNotEmpty(list) ? list : Lists.newArrayList();
+        return getUnpaidOrderList(startTime, endTime);
     }
 
     /**