Merge remote-tracking branch 'origin/master'

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);
+
     /**
      * 根据主键查询
      */

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查询
      */

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);