Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into jd_dev

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

@@ -143,6 +143,26 @@ public class OrderAirController {
         return success(pageResult);
     }
 
+    @GetMapping("/data/scope/can/shipment/count")
+    @ApiOperation("数据权限范围可出订单列表数量统计")
+    public CommonResult<Long> dataScopeCanShipmentCount() {
+        OrderQueryVO query = new OrderQueryVO();
+
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        if (Objects.isNull(loginUser)){
+            return error(ErrorCodeConstants.USER_NOT_EXISTS);
+        }
+        List<RoleRespDTO> roleRespDTOS = roleApi.getRoles(loginUser.getRoleIds());
+        if (Objects.isNull(roleRespDTOS)){
+            return error(ROLE_NOT_EXISTS);
+        }
+        addDataScopeQuery(query, loginUser, roleRespDTOS);
+        query.setUserType(UserTypeEnum.ADMIN.getValue());
+        query.setAirShipment(12); // 可出
+        long count = orderQueryService.orderCount(query);
+        return success(count);
+    }
+
     @GetMapping("/ready-stock-processing/shipment/page")
     @ApiOperation("备货中订单列表")
     public CommonResult<PageResult<OrderBackPageVO>> readyStockProcessingShipmentPage(OrderQueryVO query, PageVO page) {