Merge branch 'master' into dev

# Conflicts:
#	yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/order/OrderMapper.java

@@ -1922,8 +1922,11 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
 
     List<OrderBackPageVO> adminCargoControlOrderList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query);
 
+    List<OrderBackPageVO> adminCargoControlMyOrderList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryDTO query);
+
     long adminCargoControlOrderCount(@Param("query") OrderQueryVO query);
 
+    long adminCargoControlMyOrderCount(@Param("query") OrderQueryDTO query);
     @ResultType(OrderBackPageVO.class)
     @Select({
             "<script>",
@@ -3839,7 +3842,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsList(@Param("query") OrderQueryVO query);
+    List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsList(@Param("query") OrderQueryDTO query);
 
     /**
      * 重货统计
@@ -3847,7 +3850,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderHeavyExcelVo> getHeavyOrderExcelList(@Param("query") OrderQueryVO query);
+    List<OrderHeavyExcelVo> getHeavyOrderExcelList(@Param("query") OrderQueryDTO query);
 
     /**
      * 退仓统计
@@ -3855,7 +3858,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderReturnOrderExcelVo> getReturnOrderExcelList(@Param("query") OrderQueryVO query);
+    List<OrderReturnOrderExcelVo> getReturnOrderExcelList(@Param("query") OrderQueryDTO query);
 
     /**
      * 售后赔付
@@ -3863,7 +3866,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderSaleRepayExcelVo> getSaleRepayExcelList(@Param("query") OrderQueryVO query);
+    List<OrderSaleRepayExcelVo> getSaleRepayExcelList(@Param("query") OrderQueryDTO query);
 
     /**
      * 报关数据
@@ -3871,7 +3874,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(@Param("query") OrderQueryVO query);
+    List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(@Param("query") OrderQueryDTO query);
 
     /**
      * 出货量
@@ -3879,7 +3882,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderShipDataExcelVo> getShipDatasExcelList(@Param("query") OrderQueryVO query);
+    List<OrderShipDataExcelVo> getShipDatasExcelList(@Param("query") OrderQueryDTO query);
 
     /**
      * 预付运费
@@ -3887,7 +3890,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderShipFeeExcelVo> getShipFeeExcelList(@Param("query") OrderQueryVO query);
+    List<OrderShipFeeExcelVo> getShipFeeExcelList(@Param("query") OrderQueryDTO query);
 
     @ResultType(OrderDO.class)
     @Select({

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/AdvanceOrderExcelExportListener.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
+import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderShipDataExcelVo;
@@ -51,7 +52,7 @@ public class AdvanceOrderExcelExportListener {
             try {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
                 String nowTime = formatter.format(LocalDateTime.now());
-                OrderQueryVO query  = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
+                OrderQueryDTO query  = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
                 query.setLang(event.getLang());
                 List<OrderShipFeeExcelVo> list = orderQueryService.getShipFeeExcelList(query);
                 String sheetName = event.getLang() == 0 ? "预付运费统计" : "advance fee statistics";

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/ContainerNumberOrderExcelExportListener.java

@@ -10,6 +10,7 @@ import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
 import cn.iocoder.yudao.module.order.dto.OrderCostSummaryDto;
+import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
@@ -60,9 +61,9 @@ public class ContainerNumberOrderExcelExportListener {
                 PageVO page = new PageVO();
                 page.setRows(10000);
                 page.setPage(1);
-                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
+                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
                 query.setLang(event.getLang());
-                PageResult<OrderBackPageVO> orderPage = orderQueryService.orderPage(query, page);
+                PageResult<OrderBackPageVO> orderPage = orderQueryService.myOrderPage(query, page);
                 if (CollectionUtil.isNotEmpty(orderPage.getList())) {
                     String nameZh = String.format("自编号%s的订单费用汇总统计", query.getContainerNumber());
                     String nameEn = String.format("Summary Statistics of Order Expenses from ID%s", query.getContainerNumber());

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/CustomsOrderExcelExportListener.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
+import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderCustomsDatasExcelVo;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
@@ -50,7 +51,7 @@ public class CustomsOrderExcelExportListener {
             try {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
                 String nowTime = formatter.format(LocalDateTime.now());
-                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
+                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
                 query.setLang(event.getLang());
                 List<OrderCustomsDatasExcelVo> list = orderQueryService.getCustomsDatasExcelList(query);
                 String sheetName = event.getLang() == 0 ? "报关数据统计" : "customs data statistics";

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/ExceptionOrderStatisticsExcelExportListener.java

@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.apollo.core.event.export.ExceptionOrderStatist
 import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
+import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionStatisticsExcelVo;
@@ -49,7 +50,7 @@ public class ExceptionOrderStatisticsExcelExportListener {
             try {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
                 String nowTime = formatter.format(LocalDateTime.now());
-                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
+                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
                 query.setLang(event.getLang());
                 List<OrderExceptionStatisticsExcelVo> list = orderQueryService.getOrderExceptionStatisticsExcel(query);
                 String sheetName = event.getLang() == 0 ? "异常单统计" : "Order exception statistics";

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/HeavyOrderExcelExportListener.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
+import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderHeavyExcelVo;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
@@ -50,7 +51,7 @@ public class HeavyOrderExcelExportListener {
             try {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
                 String nowTime = formatter.format(LocalDateTime.now());
-                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
+                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
                 query.setLang(event.getLang());
                 List<OrderHeavyExcelVo> list = orderQueryService.getHeavyOrderExcelList(query);
                 String sheetName = event.getLang() == 0 ? "重货单统计" : "heavy order statistics";

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/OrderCargoControlExcelExportListener.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.order.listener.export;
 
 import cn.iocoder.yudao.framework.apollo.core.event.export.OrderCargoControlExcelExportEvent;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
+import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.orderCargoControl.OrderCargoControlService;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import com.alibaba.fastjson.JSONObject;
@@ -32,7 +33,7 @@ public class OrderCargoControlExcelExportListener {
     public void orderCargoControlExcelExportEvent(OrderCargoControlExcelExportEvent event) {
         if (StringUtils.isNotBlank(event.getRequestParams())){
             try {
-                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
+                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
                 query.setLang(event.getLang());
                 FileDO fileDO = orderCargoControlService.makeCargoControlOrderExcelFile(event.getUserId(), event.getUserType(), query);
                 event.setPath(fileDO.getPath());

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/OrderExcelExportListener.java

@@ -33,27 +33,27 @@ public class OrderExcelExportListener {
      *
      * @param event 编号记录
      */
-    @EventListener(OrderExcelExportEvent.class)
-    public void orderExcelExportEvent(OrderExcelExportEvent event) throws IOException {
-        if (StringUtils.isNotBlank(event.getRequestParams())){
-            try {
-                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
-                query.setLang(event.getLang());
-                FileDO fileDO = orderQueryService.makeOrderExcelFile(event.getUserId(), event.getUserType(), query);
-                event.setPath(fileDO.getPath());
-                event.setFileName(fileDO.getPath());
-                event.setUrl(fileDO.getUrl());
-                event.setFileId(fileDO.getId());
-            }catch (Exception e){
-                // TODO 测试阶段打印堆栈错误信息，便于分析原因
-                e.printStackTrace();
-                event.setResult(e.getMessage());
-            }
-        }else {
-            event.setResult("param fail");
-        }
-
-    }
+//    @EventListener(OrderExcelExportEvent.class)
+//    public void orderExcelExportEvent(OrderExcelExportEvent event) throws IOException {
+//        if (StringUtils.isNotBlank(event.getRequestParams())){
+//            try {
+//                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
+//                query.setLang(event.getLang());
+//                FileDO fileDO = orderQueryService.makeOrderExcelFile(event.getUserId(), event.getUserType(), query);
+//                event.setPath(fileDO.getPath());
+//                event.setFileName(fileDO.getPath());
+//                event.setUrl(fileDO.getUrl());
+//                event.setFileId(fileDO.getId());
+//            }catch (Exception e){
+//                // TODO 测试阶段打印堆栈错误信息，便于分析原因
+//                e.printStackTrace();
+//                event.setResult(e.getMessage());
+//            }
+//        }else {
+//            event.setResult("param fail");
+//        }
+//
+//    }
 
     @EventListener(OrderExcelExportEvent.class)
     public void MyOrderExcelExportEvent(OrderExcelExportEvent event) throws IOException {

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/ReturnOrderExcelExportListener.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
+import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderReturnOrderExcelVo;
@@ -50,7 +51,7 @@ public class ReturnOrderExcelExportListener {
             try {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
                 String nowTime = formatter.format(LocalDateTime.now());
-                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
+                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
                 query.setLang(event.getLang());
                 List<OrderReturnOrderExcelVo> list = orderQueryService.getReturnOrderExcelList(query);
                 String sheetName = event.getLang() == 0 ? "重货单统计" : "heavy order statistics";

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/SaleRepayOrderExcelExportListener.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
+import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderSaleRepayExcelVo;
@@ -50,7 +51,7 @@ public class SaleRepayOrderExcelExportListener {
             try {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
                 String nowTime = formatter.format(LocalDateTime.now());
-                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
+                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
                 query.setLang(event.getLang());
                 List<OrderSaleRepayExcelVo> list = orderQueryService.getSaleRepayExcelList(query);
                 String sheetName = event.getLang() == 0 ? "售后赔偿金额统计" : "sale repay statistics";

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/ShippingOrderExcelExportListener.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
+import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderCustomsDatasExcelVo;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
@@ -51,7 +52,7 @@ public class ShippingOrderExcelExportListener {
             try {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
                 String nowTime = formatter.format(LocalDateTime.now());
-                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
+                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
                 query.setLang(event.getLang());
                 List<OrderShipDataExcelVo> list = orderQueryService.getShipDatasExcelList(query);
                 String sheetName = event.getLang() == 0 ? "客户出货量统计" : "shipping data statistics";

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/OrderQueryService.java

@@ -186,6 +186,8 @@ public interface OrderQueryService {
 
     PageResult<OrderBackPageVO> adminCargoControlOrderPage(OrderQueryVO query, PageVO page);
 
+    PageResult<OrderBackPageVO> adminCargoControlMyOrderPage(OrderQueryDTO query, PageVO page);
+
     PageResult<OrderBackPageVO> appCargoControlOrderPage(OrderQueryVO query, PageVO page);
 
 
@@ -320,19 +322,19 @@ public interface OrderQueryService {
 
     FileDO makeMyOrderExcelFile(Long userId, Integer userType, OrderQueryDTO query) throws Exception;
 
-    List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsExcel(OrderQueryVO query);
+    List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsExcel(OrderQueryDTO query);
 
-    List<OrderHeavyExcelVo> getHeavyOrderExcelList(OrderQueryVO query);
+    List<OrderHeavyExcelVo> getHeavyOrderExcelList(OrderQueryDTO query);
 
-    List<OrderReturnOrderExcelVo> getReturnOrderExcelList(OrderQueryVO query);
+    List<OrderReturnOrderExcelVo> getReturnOrderExcelList(OrderQueryDTO query);
 
-    List<OrderSaleRepayExcelVo> getSaleRepayExcelList(OrderQueryVO query);
+    List<OrderSaleRepayExcelVo> getSaleRepayExcelList(OrderQueryDTO query);
 
-    List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(OrderQueryVO query);
+    List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(OrderQueryDTO query);
 
-    List<OrderShipDataExcelVo> getShipDatasExcelList(OrderQueryVO query);
+    List<OrderShipDataExcelVo> getShipDatasExcelList(OrderQueryDTO query);
 
-    List<OrderShipFeeExcelVo> getShipFeeExcelList(OrderQueryVO query);
+    List<OrderShipFeeExcelVo> getShipFeeExcelList(OrderQueryDTO query);
 
     /**
      * 查询订单的身份信息

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java

@@ -1115,6 +1115,19 @@ public class OrderQueryServiceImpl implements OrderQueryService {
         return new PageResult<>(list, total, mpPage.getSize(), page.getPage(), (total + mpPage.getSize() - 1) / mpPage.getSize());
     }
 
+    @Override
+    public PageResult<OrderBackPageVO> adminCargoControlMyOrderPage(OrderQueryDTO query, PageVO page) {
+        query.setLang(I18nMessage.getLang());
+        caseStatus(query.getStatus(),query);
+        IPage<OrderBackPageVO> mpPage = MyBatisUtils.buildPage(page);
+        long total = orderMapper.adminCargoControlMyOrderCount(query);
+        log.warn(I18nMessage.getLang().toString());
+        int start = (page.getPage() - 1) * page.getRows();
+        int size = page.getRows();
+        List<OrderBackPageVO> list = orderMapper.adminCargoControlMyOrderList(start, size, query);
+        return new PageResult<>(list, total, mpPage.getSize(), page.getPage(), (total + mpPage.getSize() - 1) / mpPage.getSize());
+    }
+
     @Override
     public PageResult<OrderBackPageVO> appCargoControlOrderPage(OrderQueryVO query, PageVO page) {
         query.setLang(I18nMessage.getLang());
@@ -1127,7 +1140,6 @@ public class OrderQueryServiceImpl implements OrderQueryService {
         return new PageResult<>(list, total, mpPage.getSize(), page.getPage(), (total + mpPage.getSize() - 1) / mpPage.getSize());
     }
 
-
     @Override
     public PageResult<OrderBackPageVO> receivedOrderPage(OrderQueryVO query, PageVO page) {
         query.setLang(I18nMessage.getLang());
@@ -1878,7 +1890,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
     public FileDO makeMyOrderExcelFile(Long userId, Integer userType, OrderQueryDTO query) throws Exception {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
         String nowTime = formatter.format(LocalDateTime.now());
-
+        caseStatus(query.getStatus(),query);
         String sheetName = query.getLang() == 0 ? "订单管理第{0}页" : "Order Management number {0}";
         if (Objects.isNull(userId)) {
             userId = 0L;
@@ -1960,7 +1972,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
      * @return
      */
     @Override
-    public List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsExcel(OrderQueryVO query) {
+    public List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsExcel(OrderQueryDTO query) {
+        caseStatus(query.getStatus(),query);
         return orderMapper.getOrderExceptionStatisticsList(query);
     }
 
@@ -1970,7 +1983,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
      * @return
      */
     @Override
-    public List<OrderHeavyExcelVo> getHeavyOrderExcelList(OrderQueryVO query) {
+    public List<OrderHeavyExcelVo> getHeavyOrderExcelList(OrderQueryDTO query) {
+        caseStatus(query.getStatus(),query);
         return orderMapper.getHeavyOrderExcelList(query);
     }
 
@@ -1981,7 +1995,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
      * @return
      */
     @Override
-    public List<OrderReturnOrderExcelVo> getReturnOrderExcelList(OrderQueryVO query) {
+    public List<OrderReturnOrderExcelVo> getReturnOrderExcelList(OrderQueryDTO query) {
+        caseStatus(query.getStatus(),query);
         return orderMapper.getReturnOrderExcelList(query);
     }
 
@@ -1992,7 +2007,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
      * @return
      */
     @Override
-    public List<OrderSaleRepayExcelVo> getSaleRepayExcelList(OrderQueryVO query) {
+    public List<OrderSaleRepayExcelVo> getSaleRepayExcelList(OrderQueryDTO query) {
+        caseStatus(query.getStatus(),query);
         return orderMapper.getSaleRepayExcelList(query);
     }
 
@@ -2003,7 +2019,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
      * @return
      */
     @Override
-    public List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(OrderQueryVO query) {
+    public List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(OrderQueryDTO query) {
+        caseStatus(query.getStatus(),query);
         return orderMapper.getCustomsDatasExcelList(query);
     }
 
@@ -2014,7 +2031,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
      * @return
      */
     @Override
-    public List<OrderShipDataExcelVo> getShipDatasExcelList(OrderQueryVO query) {
+    public List<OrderShipDataExcelVo> getShipDatasExcelList(OrderQueryDTO query) {
+        caseStatus(query.getStatus(),query);
         return orderMapper.getShipDatasExcelList(query);
     }
 
@@ -2025,7 +2043,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
      * @return
      */
     @Override
-    public List<OrderShipFeeExcelVo> getShipFeeExcelList(OrderQueryVO query) {
+    public List<OrderShipFeeExcelVo> getShipFeeExcelList(OrderQueryDTO query) {
+        caseStatus(query.getStatus(),query);
         return orderMapper.getShipFeeExcelList(query);
     }
 

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlService.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderCargoControl.OrderCargoControlDO;
 import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto;
+import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderSendSmsReqVO;
@@ -107,8 +108,9 @@ public interface OrderCargoControlService extends IService<OrderCargoControlDO>
 
     void exportCargoControlOrderExcel(HttpServletResponse response, OrderQueryVO query) throws IOException;
 
-    FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception;
+   // FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception;
 
+    FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryDTO query) throws Exception;
     /**
      * 判断是否控货人是否设置了控货密码
      *

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlServiceImpl.java

@@ -22,6 +22,7 @@ import cn.iocoder.yudao.module.order.dal.dataobject.orderCargoControl.OrderCargo
 import cn.iocoder.yudao.module.order.dal.dataobject.orderConsignor.OrderConsignorDO;
 import cn.iocoder.yudao.module.order.dal.mysql.orderCargoControl.OrderCargoControlMapper;
 import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto;
+import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.enums.OrderStatusEnum;
 import cn.iocoder.yudao.module.order.service.order.OrderBusinessService;
 import cn.iocoder.yudao.module.order.service.order.OrderConsignorService;
@@ -42,6 +43,7 @@ import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.AllArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -56,10 +58,7 @@ import java.net.URLEncoder;
 import java.text.MessageFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -384,7 +383,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
     }
 
     @Override
-    public FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception {
+    public FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryDTO query) throws Exception {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
         String nowTime = formatter.format(LocalDateTime.now());
 
@@ -408,7 +407,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
         OutputStream out = new FileOutputStream(path);
         ExcelWriter excelWriter = EasyExcel.write(out, OrderCargoControlExcelVO.class).inMemory(true).build();
         PageVO page = new PageVO();
-        PageResult<OrderBackPageVO> pageResult = orderQueryService.adminCargoControlOrderPage(query, page);
+        PageResult<OrderBackPageVO> pageResult = orderQueryService.adminCargoControlMyOrderPage(query, page);
         long total = pageResult.getTotal();
         int pageNumber = (int) Math.ceil((double) total / (double) PAGE_SIZE);    //分页条数看情况
         // 去调用写入,根据数据库分页的总的页数来
@@ -419,7 +418,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
             page.setPage(i);
             page.setRows(PAGE_SIZE);
             page.setField("o.order_id");
-            PageResult<OrderBackPageVO> mpPage = orderQueryService.adminCargoControlOrderPage(query, page);
+            PageResult<OrderBackPageVO> mpPage = orderQueryService.adminCargoControlMyOrderPage(query, page);
             List<OrderCargoControlExcelVO> pageList = mpPage.getList().stream().map(backPageVO -> {
                 OrderCargoControlExcelVO excelVO = new OrderCargoControlExcelVO();
                 BeanUtils.copyProperties(backPageVO, excelVO);