From 69af30cd371e07a29f7443767e6bc16ab0b34b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=92?= <van666666@foxmail.com>
Date: Sat, 13 Sep 2025 20:16:38 +0800
Subject: [PATCH 1/4] 1

---
 .../system/JDOrderListController.java         | 16 ++++++++-
 .../ruoyi/jarvis/mapper/JDOrderMapper.java    |  5 +++
 .../ruoyi/jarvis/service/IJDOrderService.java |  5 +++
 .../service/impl/JDOrderServiceImpl.java      |  5 +++
 .../resources/mapper/jarvis/JDOrderMapper.xml | 36 ++++++++++++++++++-
 5 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
index 432fb82..1edbf5b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
@@ -41,7 +41,21 @@ public class JDOrderListController extends BaseController
     @org.springframework.web.bind.annotation.GetMapping("/list")
     public TableDataInfo list(JDOrder query) {
         startPage();
-        java.util.List<JDOrder> list = jdOrderService.selectJDOrderList(query);
+        
+        // 处理排序参数
+        String orderBy = getRequest().getParameter("orderBy");
+        String isAsc = getRequest().getParameter("isAsc");
+        
+        java.util.List<JDOrder> list;
+        if (orderBy != null && !orderBy.isEmpty()) {
+            // 设置排序参数
+            query.getParams().put("orderBy", orderBy);
+            query.getParams().put("isAsc", isAsc);
+            list = jdOrderService.selectJDOrderListWithSort(query);
+        } else {
+            list = jdOrderService.selectJDOrderList(query);
+        }
+        
         TableDataInfo dataTable = getDataTable(list);
         List<JDOrder> rows = (List<JDOrder>) dataTable.getRows();
         for (JDOrder jdOrder : rows) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/JDOrderMapper.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/JDOrderMapper.java
index 9547f89..1072f6b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/JDOrderMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/JDOrderMapper.java
@@ -13,6 +13,11 @@ public interface JDOrderMapper {
      */
     List<JDOrder> selectJDOrderList(JDOrder jdOrder);
 
+    /**
+     * 查询京东订单列表（支持动态排序）
+     */
+    List<JDOrder> selectJDOrderListWithSort(JDOrder jdOrder);
+
     /**
      * 根据主键查询
      */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderService.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderService.java
index 20c00e9..170a438 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderService.java
@@ -12,6 +12,11 @@ public interface IJDOrderService {
      */
     List<JDOrder> selectJDOrderList(JDOrder jdOrder);
 
+    /**
+     * 查询列表（支持动态排序）
+     */
+    List<JDOrder> selectJDOrderListWithSort(JDOrder jdOrder);
+
     /**
      * 按ID查询
      */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderServiceImpl.java
index 19e4ac9..38efabc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderServiceImpl.java
@@ -19,6 +19,11 @@ public class JDOrderServiceImpl implements IJDOrderService {
         return jdOrderMapper.selectJDOrderList(jdOrder);
     }
 
+    @Override
+    public List<JDOrder> selectJDOrderListWithSort(JDOrder jdOrder) {
+        return jdOrderMapper.selectJDOrderListWithSort(jdOrder);
+    }
+
     @Override
     public JDOrder selectJDOrderById(Long id) {
         return jdOrderMapper.selectJDOrderById(id);
diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
index f2c8dc2..1e5e8b9 100644
--- a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
@@ -48,7 +48,41 @@
                 and order_time &lt;= #{params.endTime}
             </if>
         </where>
-        order by order_time desc, id desc
+        order by remark asc, order_time desc, id desc
+    </select>
+
+    <select id="selectJDOrderListWithSort" parameterType="JDOrder" resultMap="JDOrderResult">
+        <include refid="selectJDOrderBase"/>
+        <where>
+            <if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
+            <if test="distributionMark != null and distributionMark != ''"> and distribution_mark = #{distributionMark}</if>
+            <if test="modelNumber != null and modelNumber != ''"> and model_number like concat('%', #{modelNumber}, '%')</if>
+            <if test="link != null and link != ''"> and link like concat('%', #{link}, '%')</if>
+            <if test="paymentAmount != null"> and payment_amount = #{paymentAmount}</if>
+            <if test="rebateAmount != null"> and rebate_amount = #{rebateAmount}</if>
+            <if test="address != null and address != ''"> and address like concat('%', #{address}, '%')</if>
+            <if test="logisticsLink != null and logisticsLink != ''"> and logistics_link like concat('%', #{logisticsLink}, '%')</if>
+            <if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
+            <if test="buyer != null and buyer != ''"> and buyer like concat('%', #{buyer}, '%')</if>
+            <if test="orderTime != null"> and order_time = #{orderTime}</if>
+            <if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and order_time &gt;= #{params.beginTime}
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and order_time &lt;= #{params.endTime}
+            </if>
+        </where>
+        <choose>
+            <when test="params.orderBy != null and params.orderBy != ''">
+                order by ${params.orderBy}
+                <if test="params.isAsc != null and params.isAsc == 'asc'">asc</if>
+                <if test="params.isAsc == null or params.isAsc == 'desc'">desc</if>
+            </when>
+            <otherwise>
+                order by remark asc, order_time desc, id desc
+            </otherwise>
+        </choose>
     </select>
 
     <select id="selectJDOrderById" parameterType="long" resultMap="JDOrderResult">

From 4e6526f74c163c23670a719fe9be82f8eee5734f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=92?= <van666666@foxmail.com>
Date: Sat, 13 Sep 2025 22:32:00 +0800
Subject: [PATCH 2/4] 1

---
 .../web/controller/system/JDOrderListController.java  | 11 +++++++++++
 .../main/resources/mapper/jarvis/JDOrderMapper.xml    |  8 ++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
index 1edbf5b..564963a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
@@ -46,6 +46,17 @@ public class JDOrderListController extends BaseController
         String orderBy = getRequest().getParameter("orderBy");
         String isAsc = getRequest().getParameter("isAsc");
         
+        // 处理时间筛选参数
+        String beginTimeStr = getRequest().getParameter("beginTime");
+        String endTimeStr = getRequest().getParameter("endTime");
+        
+        if (beginTimeStr != null && !beginTimeStr.isEmpty()) {
+            query.getParams().put("beginTime", beginTimeStr);
+        }
+        if (endTimeStr != null && !endTimeStr.isEmpty()) {
+            query.getParams().put("endTime", endTimeStr);
+        }
+        
         java.util.List<JDOrder> list;
         if (orderBy != null && !orderBy.isEmpty()) {
             // 设置排序参数
diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
index 1e5e8b9..c29a9f3 100644
--- a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
@@ -42,10 +42,10 @@
             <if test="orderTime != null"> and order_time = #{orderTime}</if>
             <if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-                and order_time &gt;= #{params.beginTime}
+                and date(order_time) &gt;= #{params.beginTime}
             </if>
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-                and order_time &lt;= #{params.endTime}
+                and date(order_time) &lt;= #{params.endTime}
             </if>
         </where>
         order by remark asc, order_time desc, id desc
@@ -67,10 +67,10 @@
             <if test="orderTime != null"> and order_time = #{orderTime}</if>
             <if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-                and order_time &gt;= #{params.beginTime}
+                and date(order_time) &gt;= #{params.beginTime}
             </if>
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-                and order_time &lt;= #{params.endTime}
+                and date(order_time) &lt;= #{params.endTime}
             </if>
         </where>
         <choose>

From caec1dd14cb1e14086278f60bd3cf90abe88c896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=92?= <van666666@foxmail.com>
Date: Sat, 13 Sep 2025 22:38:57 +0800
Subject: [PATCH 3/4] 1

---
 .../web/controller/system/JDOrderListController.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
index 564963a..6c9113f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.system;
 
 import java.io.IOException;
 import java.util.List;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.jarvis.domain.OrderRows;
@@ -39,16 +40,16 @@ public class JDOrderListController extends BaseController
      * 查询JD订单列表
      */
     @org.springframework.web.bind.annotation.GetMapping("/list")
-    public TableDataInfo list(JDOrder query) {
+    public TableDataInfo list(JDOrder query, HttpServletRequest request) {
         startPage();
         
         // 处理排序参数
-        String orderBy = getRequest().getParameter("orderBy");
-        String isAsc = getRequest().getParameter("isAsc");
+        String orderBy = request.getParameter("orderBy");
+        String isAsc = request.getParameter("isAsc");
         
         // 处理时间筛选参数
-        String beginTimeStr = getRequest().getParameter("beginTime");
-        String endTimeStr = getRequest().getParameter("endTime");
+        String beginTimeStr = request.getParameter("beginTime");
+        String endTimeStr = request.getParameter("endTime");
         
         if (beginTimeStr != null && !beginTimeStr.isEmpty()) {
             query.getParams().put("beginTime", beginTimeStr);

From 0c6f0ea0128fc534cc735f691e5bf8e5c854b523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=92?= <van666666@foxmail.com>
Date: Sat, 13 Sep 2025 22:48:02 +0800
Subject: [PATCH 4/4] 1

---
 .../src/main/resources/mapper/jarvis/JDOrderMapper.xml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
index c29a9f3..e390948 100644
--- a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
@@ -48,7 +48,7 @@
                 and date(order_time) &lt;= #{params.endTime}
             </if>
         </where>
-        order by remark asc, order_time desc, id desc
+        order by create_time desc, remark asc, id desc
     </select>
 
     <select id="selectJDOrderListWithSort" parameterType="JDOrder" resultMap="JDOrderResult">
@@ -80,7 +80,7 @@
                 <if test="params.isAsc == null or params.isAsc == 'desc'">desc</if>
             </when>
             <otherwise>
-                order by remark asc, order_time desc, id desc
+                order by create_time desc, remark asc, id desc
             </otherwise>
         </choose>
     </select>