1

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java

@@ -64,6 +64,12 @@ public class JDOrderListController extends BaseController
             query.getParams().put("hasFinishTime", true);
         }
         
+        // 处理混合搜索参数（订单号/第三方单号/分销标识）
+        String orderSearch = request.getParameter("orderSearch");
+        if (orderSearch != null && !orderSearch.trim().isEmpty()) {
+            query.getParams().put("orderSearch", orderSearch.trim());
+        }
+        
         java.util.List<JDOrder> list;
         if (orderBy != null && !orderBy.isEmpty()) {
             // 设置排序参数