From 78a9e5b8ad83667d2daa01e35843bd2f7a669d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Thu, 28 Nov 2024 09:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8C=82=E8=B4=A6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9B=B8=E5=85=B3=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TbPointsExchangeRecordServiceImpl.java  |  2 +-
 .../impl/TbShopTableBookingServiceImpl.java      | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbPointsExchangeRecordServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbPointsExchangeRecordServiceImpl.java
index 00071ce7..ccb65cda 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbPointsExchangeRecordServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbPointsExchangeRecordServiceImpl.java
@@ -250,7 +250,7 @@ public class TbPointsExchangeRecordServiceImpl extends ServiceImpl<TbPointsExcha
                         .set(TbPointsExchangeRecord::getCancelOrRefundTime, new Date())
                         .set(TbPointsExchangeRecord::getCancelOrRefundReason, "超时未支付，系统自动取消订单")
                 .eq(TbPointsExchangeRecord::getStatus, "unpaid")
-                .last("and TIMESTAMPDIFF(MINUTE, create_time, NOW()) >= 5"));
+                .last("and TIMESTAMPDIFF(MINUTE, NOW(), create_time) >= 5"));
     }
 
 }
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopTableBookingServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopTableBookingServiceImpl.java
index a5980aba..281c63cd 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopTableBookingServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopTableBookingServiceImpl.java
@@ -261,10 +261,16 @@ public class TbShopTableBookingServiceImpl extends ServiceImpl<TbShopTableBookin
 
     @Override
     public Map<String, Object> summary(Integer shopId, String[] phoneNos) {
-        List<Map<String, Object>> list = baseMapper.summaryByPhoneNos(shopId, Arrays.asList(phoneNos));
-        Map<String, Object> result = new HashMap<>(phoneNos.length);
+        List<String> phoneNoList = Arrays.asList(phoneNos).stream().distinct().collect(Collectors.toList());
+        List<List<String>> splits = CollUtil.split(phoneNoList, 10);
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (List<String> split : splits) {
+            List<Map<String, Object>> subList = baseMapper.summaryByPhoneNos(shopId, split);
+            list.addAll(subList);
+        }
+        Map<String, Object> result = new HashMap<>(phoneNoList.size());
         for (String phoneNo : phoneNos) {
-            Map<String, Object> fillData = new HashMap<>(2);
+            Map<String, Object> fillData = new HashMap<>(3);
             fillData.put("consumeOrders", 0);
             fillData.put("cancelOrders", 0);
             fillData.put("phoneNumber", phoneNo);
@@ -279,7 +285,7 @@ public class TbShopTableBookingServiceImpl extends ServiceImpl<TbShopTableBookin
         baseMapper.update(Wrappers.<TbShopTableBooking>lambdaUpdate()
                 .set(TbShopTableBooking::getStatus, 999)
                 .eq(TbShopTableBooking::getStatus, 20)
-                .last("and TIMESTAMPDIFF(MINUTE, booking_time, NOW()) >= timeout_minute"));
+                .last("and TIMESTAMPDIFF(MINUTE, NOW(), booking_time) >= timeout_minute"));
     }
 
     @Override
@@ -288,7 +294,7 @@ public class TbShopTableBookingServiceImpl extends ServiceImpl<TbShopTableBookin
         baseMapper.update(Wrappers.<TbShopTableBooking>lambdaUpdate()
                 .set(TbShopTableBooking::getStatus, -1)
                 .eq(TbShopTableBooking::getStatus, 999)
-                .last("and TIMESTAMPDIFF(MINUTE, booking_time, NOW()) >= timeout_minute+15"));
+                .last("and TIMESTAMPDIFF(MINUTE, NOW(), booking_time) >= timeout_minute+15"));
     }
 
 }
\ No newline at end of file