From 10ce44003f0a77949155f6b36c0d952eefa91be3 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 13 Feb 2025 13:53:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=20=E6=8E=92=E5=BA=8F=20?=
 =?UTF-8?q?=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/core/page/PageDomain.java    | 28 -------------------
 .../src/main/java/com/czg/utils/PageUtil.java | 28 ++++---------------
 .../src/main/java/com/czg/Main.java           |  3 +-
 3 files changed, 7 insertions(+), 52 deletions(-)
 delete mode 100644 cash-common/cash-common-tools/src/main/java/com/czg/core/page/PageDomain.java

diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/core/page/PageDomain.java b/cash-common/cash-common-tools/src/main/java/com/czg/core/page/PageDomain.java
deleted file mode 100644
index a85292af4..000000000
--- a/cash-common/cash-common-tools/src/main/java/com/czg/core/page/PageDomain.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.czg.core.page;
-
-
-import lombok.Data;
-
-/**
- * 分页数据
- *
- * @author cashier
- */
-@Data
-public class PageDomain {
-    /**
-     * 当前记录起始索引
-     */
-    private Integer page;
-
-    /**
-     * 每页显示记录数
-     */
-    private Integer size;
-
-    /**
-     * 组合后的排序规则，例如：user_name asc,user_age desc (前端来处理排序字段驼峰转下划线)
-     */
-    private String orderBy;
-
-}
diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/utils/PageUtil.java b/cash-common/cash-common-tools/src/main/java/com/czg/utils/PageUtil.java
index e5f29fd2c..b7dd5412a 100644
--- a/cash-common/cash-common-tools/src/main/java/com/czg/utils/PageUtil.java
+++ b/cash-common/cash-common-tools/src/main/java/com/czg/utils/PageUtil.java
@@ -2,7 +2,6 @@ package com.czg.utils;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
-import com.czg.core.page.PageDomain;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.servlet.http.HttpServletRequest;
@@ -62,11 +61,8 @@ public class PageUtil {
     }
 
     /**
-     * 构造分页QueryWrapper
-     * <p>
-     * 从param体获取 (url请求 ?拼接的参数)
-     * page 默认1
-     * size 默认10
+     * 构造排序QueryWrapper
+     *  从param体获取
      * <p>
      * orderField 排序字段列 驼峰命名 多个用逗号分隔
      * order排序规则 asc,desc 多个条件逗号分割
@@ -75,24 +71,10 @@ public class PageUtil {
      */
     public QueryWrapper buildPageQueryWrapper() {
         QueryWrapper queryWrapper = QueryWrapper.create();
-        PageDomain pageDomain = buildPageAndSortRequest();
-        if (StrUtil.isNotEmpty(pageDomain.getOrderBy())) {
-            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
-            queryWrapper.orderBy(orderBy);
+        String orderBy = ServletUtil.getRequest().getParameter(ORDER_BY);
+        if (StrUtil.isNotEmpty(orderBy)) {
+            queryWrapper.orderBy(SqlUtil.escapeOrderBySql(orderBy));
         }
         return queryWrapper;
     }
-
-
-    /**
-     * 封装分页对象
-     */
-    private PageDomain buildPageAndSortRequest() {
-        PageDomain pageDomain = new PageDomain();
-        HttpServletRequest request = ServletUtil.getRequest();
-        pageDomain.setPage(Convert.toInt(request.getParameter(PAGE), DEFAULT_PAGE));
-        pageDomain.setSize(Convert.toInt(request.getParameter(SIZE), DEFAULT_SIZE));
-        pageDomain.setOrderBy(request.getParameter(ORDER_BY));
-        return pageDomain;
-    }
 }
diff --git a/cash-service/code-generator/src/main/java/com/czg/Main.java b/cash-service/code-generator/src/main/java/com/czg/Main.java
index 80eacdfd3..1d38fde1d 100644
--- a/cash-service/code-generator/src/main/java/com/czg/Main.java
+++ b/cash-service/code-generator/src/main/java/com/czg/Main.java
@@ -28,7 +28,7 @@ public class Main {
 //        String servicePackageName = "product";
         String packageName = "order";
 
-        String tableName = "tb_cashier_cart";
+        String tableName = "tb_order_detail";
         String author = "ww";
 
         //配置数据源
@@ -56,6 +56,7 @@ public class Main {
         GlobalConfig dtoConfig = createDtoGlobalConfig(currentWorkingDirectory + "/cash-common/cash-common-service",
                 basePackage + packageName, "tb", tableName);
         Generator dtoGenerator = new Generator(dataSource, dtoConfig);
+        dtoConfig.setAuthor(author);
         dtoGenerator.generate();
     }