From 09952a245e4b110799b2963c1eb660d030d3e2f3 Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Sat, 14 Dec 2024 15:05:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=AC=A1=E6=95=B0bug=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DiscSpinningController.java            |  2 +-
 .../java/com/sqx/modules/orders/dao/OrdersDao.java    |  2 +-
 .../orders/service/impl/OrdersServiceImpl.java        | 11 ++++++++++-
 src/main/resources/mapper/orders/OrdersDao.xml        |  3 +--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
index 680ee673..69a9f54a 100644
--- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
+++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
@@ -151,7 +151,7 @@ public class DiscSpinningController {
             //任务抽奖
             int drawCount = Integer.parseInt(commonRepository.findOne(901).getValue());
             Integer i = recordService.countDraw(userId);
-            if (i != null && i > drawCount) {
+            if (i != null && i >= drawCount) {
                 return Result.error("当日可抽奖次数已超限");
             }
             Orders orders = ordersService.selectOrdersByDay(userId);
diff --git a/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java b/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java
index a7a98ea9..71d84577 100644
--- a/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java
+++ b/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java
@@ -36,7 +36,7 @@ public interface OrdersDao extends BaseMapper<Orders> {
 
     Integer selectOrdersCountStatisticsByYear(Integer flag, String time, Integer status);
 
-    Integer selectOrdersCountStatisticsByDay(Long userId, Integer limit);
+    Integer selectOrdersCountStatisticsByDay(Long userId);
 
     Orders selectOrdersByDay(Long userId);
 
diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java
index 6fff9b6b..0c50b8ed 100644
--- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java
+++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java
@@ -563,7 +563,16 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
 
     @Override
     public Integer selectOrdersCountStatisticsByDay(Long userId, Integer limit) {
-        return baseMapper.selectOrdersCountStatisticsByDay(userId, limit);
+        Integer count = baseMapper.selectOrdersCountStatisticsByDay(userId);
+        if (count == null) {
+            return 0;
+        }
+
+        if (count <= limit) {
+            return count;
+        }
+
+        return limit;
     }
 
     @Override
diff --git a/src/main/resources/mapper/orders/OrdersDao.xml b/src/main/resources/mapper/orders/OrdersDao.xml
index 843dba29..ebbebcbb 100644
--- a/src/main/resources/mapper/orders/OrdersDao.xml
+++ b/src/main/resources/mapper/orders/OrdersDao.xml
@@ -292,7 +292,6 @@
           AND record.order_id IS NULL
         ORDER BY
             orders.create_time
-            LIMIT #{limit}
     </select>
 
     <select id="selectOrdersByDay" resultType="com.sqx.modules.orders.entity.Orders">
@@ -320,4 +319,4 @@
             and create_time > #{time}
         </if>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>