From 8f650843e3ae618b90d0ff21722669469b1b40c0 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 29 Nov 2024 09:50:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=85=B3=E9=97=AD15?=
 =?UTF-8?q?=E5=88=86=E9=92=9F=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

---
 .../jsowell/pile/mapper/OrderBasicInfoMapper.java   |  2 ++
 .../service/impl/OrderBasicInfoServiceImpl.java     |  6 +++---
 .../resources/mapper/pile/OrderBasicInfoMapper.xml  | 13 ++++++++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
index 6f6e22b5c..f14c18d07 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
@@ -231,6 +231,8 @@ public interface OrderBasicInfoMapper {
      */
     List<OrderBasicInfo> getUnpaidOrderListOver15Min(@Param("createTime") String createTime);
 
+    List<OrderBasicInfo> getUnpaidOrderList(@Param("startTime") String startTime, @Param("endTime") String endTime);
+
     /**
      * 根据orderId批量修改订单状态
      *
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 129101a83..20c1b30c8 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
@@ -2098,9 +2098,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
      */
     @Override
     public List<OrderBasicInfo> getUnpaidOrderListOver15Min() {
-        Date now = DateUtils.addMinute(new Date(), -15);
-        String nowString = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, now);
-        List<OrderBasicInfo> list = orderBasicInfoMapper.getUnpaidOrderListOver15Min(nowString);
+        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();
     }
 
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index e598b48fb..2e7defa3d 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -2464,7 +2464,18 @@
         where del_flag = '0'
           and order_status = '0'
           and pay_status = '0'
-          and create_time <![CDATA[ <= ]]> #{createTime,jdbcType=VARCHAR}
+          <!--and create_time <![CDATA[ <= ]]> #{createTime,jdbcType=VARCHAR}-->
+      and create_time between date_sub(#{createTime,jdbcType=VARCHAR}, interval 15 minute) and  #{createTime,jdbcType=VARCHAR}
+    </select>
+
+    <select id="getUnpaidOrderList" resultMap="BaseResultMap">
+      select
+      <include refid="Base_Column_List" />
+      from order_basic_info
+      where del_flag = '0'
+      and order_status = '0'
+      and pay_status = '0'
+      and create_time between #{startTime,jdbcType=VARCHAR}  and #{endTime,jdbcType=VARCHAR}
     </select>
 
     <select id="selectOrderListByTimeRangeAndStatus" resultMap="BaseResultMap">