需求 后台-集运-追加包裹

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

@@ -188,6 +188,9 @@ public interface OrderQueryService {
 
     PageResult<OrderBackPageVO> adminCargoControlOrderPage(OrderQueryVO query, PageVO page);
 
+
+    PageResult<OrderBackPageVO> myConsOrderPage(OrderQueryVO query, PageVO page);
+
     PageResult<OrderBackPageVO> adminCargoControlMyOrderPage(OrderQueryVO query, PageVO page);
 
     PageResult<OrderBackPageVO> appCargoControlOrderPage(OrderQueryVO query, PageVO page);

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

@@ -1150,6 +1150,20 @@ public class OrderQueryServiceImpl implements OrderQueryService {
         return new PageResult<>(list, total, mpPage.getSize(), page.getPage(), (total + mpPage.getSize() - 1) / mpPage.getSize());
     }
 
+    @Override
+    public PageResult<OrderBackPageVO> myConsOrderPage(OrderQueryVO query, PageVO page) {
+        if (Objects.isNull(query.getLang())) {
+            query.setLang(I18nMessage.getLang());
+        }
+        IPage<OrderBackPageVO> mpPage = MyBatisUtils.buildPage(page);
+        long total = orderMapper.myOrderCount(query);
+        log.warn(I18nMessage.getLang().toString());
+        int start = (page.getPage() - 1) * page.getRows();
+        int size = page.getRows();
+        List<OrderBackPageVO> list = orderMapper.myOrderPageList(start, size, query);
+        return new PageResult<>(list, total, mpPage.getSize(), page.getPage(), (total + mpPage.getSize() - 1) / mpPage.getSize());
+    }
+
     @Override
     public PageResult<OrderBackPageVO> adminCargoControlMyOrderPage(OrderQueryVO query, PageVO page) {
         query.setLang(I18nMessage.getLang());

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/order/OrderController.java

@@ -361,6 +361,16 @@ public class OrderController {
         PageResult<OrderBackPageVO> pageResult = orderQueryService.orderPage(query, page);
         return success(pageResult);
     }
+    /*
+        获取我的集运订单
+    */
+    @GetMapping("/cons/page")
+    @ApiOperation("获得控货订单列表查询订单分页")
+    public CommonResult<PageResult<OrderBackPageVO>> consOrderPage(OrderQueryVO query, PageVO page) {
+        PageResult<OrderBackPageVO> pageResult =
+                orderQueryService.myConsOrderPage(query, page);
+        return success(pageResult);
+    }
 
     @GetMapping("/customer-statistics-order")
     @ApiOperation("客户详情订单统计")