diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java
index b4e5321..16eb93a 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java
@@ -329,4 +329,23 @@ public class OmsOrderController {
         }
         return new CommonResult().failed();
     }
+
+    @GetMapping("/exportExcel2")
+    @ApiOperation(value = "订单归集列表导出")
+    public void exportExcel2(OmsOrderLocationQuery omsOrderLocationQuery) {
+        //得到所有要导出的数据
+        List<OrderExcelVo> excelVos = IOmsOrderService.listExcel2(omsOrderLocationQuery);
+        //定义导出的excel名字
+        String excelName = "订单归集列表";
+        String fileNameURL = "";
+        try {
+            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        //导出订单列表
+        ExportExcelUtils.export(fileNameURL, excelVos, OrderExcelVo.class, response);
+    }
+
+
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java
index 28ce8c3..88bd260 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java
@@ -85,4 +85,5 @@ public interface IOmsOrderService extends IService<OmsOrder> {
     List<OmsOrderLocation> getPickupPoint(String id);
 
     List<OrderExcelVo> listExcel(OmsOrderQuery omsOrderQuery);
+    List<OrderExcelVo> listExcel2(OmsOrderLocationQuery omsOrderLocationQuery);
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
index 9ee4b17..950a3d1 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
@@ -375,4 +375,26 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         }
         return orders;
     }
+
+    @Override
+    public List<OrderExcelVo> listExcel2(OmsOrderLocationQuery omsOrderLocationQuery) {
+        QueryWrapper<OmsOrder> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(omsOrderLocationQuery.getValueqhd())) {
+            qw.eq("receiver_detail_address", omsOrderLocationQuery.getValueqhd());
+        }
+        if (StringUtils.isNotBlank(omsOrderLocationQuery.getValueszd())) {
+            qw.eq("receiver_region", omsOrderLocationQuery.getValueszd());
+        }
+        if (StringUtils.isNotBlank(omsOrderLocationQuery.getReceiverPhone())) {
+            qw.like("receiver_phone", omsOrderLocationQuery.getReceiverPhone());
+        }
+        List<OrderExcelVo> orders = new ArrayList<>();
+        if (StringUtils.isBlank(omsOrderLocationQuery.getStatus())) {
+            //查询全部订单
+            orders = orderMapper.listExcel(qw);
+        } else {
+            orders = orderMapper.listExcel(qw.eq("status", omsOrderLocationQuery.getStatus()));
+        }
+        return orders;
+    }
 }