智能柜项目提交

haha-admin-web/src/views/order/utils/hook.tsx

@@ -172,8 +172,10 @@ export function useOrder(tableRef: Ref) {
         startDate?: string;
         endDate?: string;
       });
-      dataList.value = data.list;
-      updatePaginationData(pagination, data);
+      // @ts-ignore - data 是 PageResult 结构
+      dataList.value = data.list || [];
+      // @ts-ignore - data 是 PageResult 结构
+      pagination.total = data.total || 0;
     } catch (error) {
       console.error("获取订单列表失败:", error);
       dataList.value = [];

haha-admin/src/main/java/com/haha/admin/config/MybatisPlusConfig.java

@@ -0,0 +1,21 @@
+package com.haha.admin.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MybatisPlusConfig {
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        PaginationInnerInterceptor paginationInterceptor = new PaginationInnerInterceptor(DbType.MYSQL);
+        paginationInterceptor.setMaxLimit(500L);
+        paginationInterceptor.setOverflow(false);
+        interceptor.addInnerInterceptor(paginationInterceptor);
+        return interceptor;
+    }
+}

haha-admin/src/main/java/com/haha/admin/config/PageHelperConfig.java

@@ -1,28 +0,0 @@
-package com.haha.admin.config;
-
-import com.github.pagehelper.PageInterceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import java.util.Properties;
-
-@Configuration
-public class PageHelperConfig {
-
-    @Bean
-    public PageInterceptor pageInterceptor() {
-        PageInterceptor pageInterceptor = new PageInterceptor();
-        Properties properties = new Properties();
-        // 数据库方言
-        properties.setProperty("helperDialect", "mysql");
-        // 分页合理化参数,默认false。当设置为true时,pageNum<=0时会查询第一页,pageNum>pages时会查询最后一页
-        properties.setProperty("reasonable", "true");
-        // 支持通过Mapper接口参数来传递分页参数
-        properties.setProperty("supportMethodsArguments", "true");
-        // 为了支持startPage(Object params)方法,增加了一个"params"参数来配置参数映射
-        properties.setProperty("params", "count=countSql");
-        // 总是返回PageInfo类型
-        properties.setProperty("returnPageInfo", "check");
-        pageInterceptor.setProperties(properties);
-        return pageInterceptor;
-    }
-}

haha-admin/src/main/java/com/haha/admin/controller/OrderController.java

@@ -34,6 +34,10 @@ public class OrderController {
     @RequirePermission("order:read")
     @GetMapping("/list")
     public Result<PageResult<Order>> list(OrderQueryDTO queryDTO) {
+        log.info("订单列表查询参数：page={}, pageSize={}, orderNo={}, deviceId={}", 
+                queryDTO.getPage(), queryDTO.getPageSize(), 
+                queryDTO.getOrderNo(), queryDTO.getDeviceId());
+        
         queryDTO.validate();
         
         IPage<Order> orderPage = orderService.getPage(

haha-miniapp/src/main/java/com/haha/miniapp/config/MybatisPlusConfig.java

@@ -0,0 +1,21 @@
+package com.haha.miniapp.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MybatisPlusConfig {
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        PaginationInnerInterceptor paginationInterceptor = new PaginationInnerInterceptor(DbType.MYSQL);
+        paginationInterceptor.setMaxLimit(500L);
+        paginationInterceptor.setOverflow(false);
+        interceptor.addInnerInterceptor(paginationInterceptor);
+        return interceptor;
+    }
+}

haha-miniapp/src/main/java/com/haha/miniapp/config/PageHelperConfig.java

@@ -1,28 +0,0 @@
-package com.haha.miniapp.config;
-
-import com.github.pagehelper.PageInterceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import java.util.Properties;
-
-@Configuration
-public class PageHelperConfig {
-
-    @Bean
-    public PageInterceptor pageInterceptor() {
-        PageInterceptor pageInterceptor = new PageInterceptor();
-        Properties properties = new Properties();
-        // 数据库方言
-        properties.setProperty("helperDialect", "mysql");
-        // 分页合理化参数，默认false。当设置为true时，pageNum<=0时会查询第一页，pageNum>pages时会查询最后一页
-        properties.setProperty("reasonable", "true");
-        // 支持通过Mapper接口参数来传递分页参数
-        properties.setProperty("supportMethodsArguments", "true");
-        // 为了支持startPage(Object params)方法，增加了一个"params"参数来配置参数映射
-        properties.setProperty("params", "count=countSql");
-        // 总是返回PageInfo类型
-        properties.setProperty("returnPageInfo", "check");
-        pageInterceptor.setProperties(properties);
-        return pageInterceptor;
-    }
-}

haha-service/pom.xml

@@ -59,12 +59,6 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
-        <!-- PageHelper -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper</artifactId>
-        </dependency>
-
         <!-- Spring Security Crypto (BCrypt 密码加密) -->
         <dependency>
             <groupId>org.springframework.security</groupId>

haha-service/src/main/java/com/haha/service/impl/OrderServiceImpl.java

@@ -33,6 +33,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public IPage<Order> getPage(int page, int pageSize, String orderNo, String deviceId, 
                                  String payStatus, Integer status, String startDate, String endDate) {
+        // 确保分页参数有效（MyBatis-Plus 要求页码从 1 开始）
+        if (page < 1) {
+            page = 1;
+        }
+        if (pageSize < 1 || pageSize > 100) {
+            pageSize = 10;  // 默认每页 10 条，最大 100 条
+        }
+        
+        log.info("订单分页查询：page={}, pageSize={}, orderNo={}, deviceId={}", page, pageSize, orderNo, deviceId);
+        
         LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
         
         // 构建查询条件

pom.xml

@@ -31,7 +31,6 @@
         <hutool.version>5.8.40</hutool.version>
         <satoken.version>1.45.0</satoken.version>
         <fastjson2.version>2.0.53</fastjson2.version>
-        <pagehelper.version>5.3.3</pagehelper.version>
         <aspectj.version>1.9.22</aspectj.version>
         <okhttp.version>4.12.0</okhttp.version>
         <lombok.version>1.18.36</lombok.version>
@@ -55,6 +54,13 @@
                 <version>${mybatis-plus.version}</version>
             </dependency>
 
+            <!-- MyBatis Plus JSqlParser (分页插件需要) -->
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-jsqlparser</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+
             <!-- Hutool 工具包 -->
             <dependency>
                 <groupId>cn.hutool</groupId>
@@ -82,13 +88,6 @@
                 <version>${satoken.version}</version>
             </dependency>
 
-            <!-- PageHelper -->
-            <dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper</artifactId>
-                <version>${pagehelper.version}</version>
-            </dependency>
-
             <!-- AspectJ -->
             <dependency>
                 <groupId>org.aspectj</groupId>
@@ -148,6 +147,12 @@
             <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
         </dependency>
 
+        <!-- MyBatis Plus JSqlParser - 分页插件需要 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-jsqlparser</artifactId>
+        </dependency>
+
         <!-- Hutool 工具包 - 通用工具类 -->
         <dependency>
             <groupId>cn.hutool</groupId>