异常订单查询 添加商品类开和增值服务

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

@@ -489,6 +489,11 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
         //跟进客服
         queryWrapper.in(null != reqVo.getSalesmanIds(), "su.customer_service_id", reqVo.getSalesmanIds());
 
+        //增值服务
+        queryWrapper.in(null != reqVo.getTypes(), "a.type", reqVo.getTypes());
+        //商品类型
+        queryWrapper.in(null != reqVo.getGoodsTypes(), "m.prod_type", reqVo.getGoodsTypes());
+
         queryWrapper.orderByDesc("e.id");
 
         return orderExceptionMapper.getOrderExceptionExcelList(queryWrapper, reqVo.getOrderExceptionType(), startTime, endTime);
@@ -2593,6 +2598,10 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
         //跟进客服
         queryWrapper.in(null != reqVo.getSalesmanIds(), "su.customer_service_id", reqVo.getSalesmanIds());
 
+        //增值服务
+        queryWrapper.in(null != reqVo.getTypes(), "a.type", reqVo.getTypes());
+        //商品类型
+        queryWrapper.in(null != reqVo.getGoodsTypes(), "m.prod_type", reqVo.getGoodsTypes());
 
         queryWrapper.orderByDesc("b.id");
 
@@ -2712,6 +2721,11 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
         //跟进客服
         queryWrapper.in(null != reqVo.getSalesmanIds(), "su.customer_service_id", reqVo.getSalesmanIds());
 
+        //增值服务
+        queryWrapper.in(null != reqVo.getTypes(), "a.type", reqVo.getTypes());
+        //商品类型
+        queryWrapper.in(null != reqVo.getGoodsTypes(), "m.prod_type", reqVo.getGoodsTypes());
+
         StatisticsOrderVO vo = orderExceptionMapper.statisticsExceptionOrder(queryWrapper, reqVo.getOrderExceptionType(), startTime, endTime);
         if (Objects.nonNull(vo)) {
             vo.setTotalVolume(new BigDecimal(vo.getTotalVolume()).setScale(2, RoundingMode.HALF_UP).toString());

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderException/OrderExceptionQueryVO.java

@@ -112,4 +112,10 @@ public class OrderExceptionQueryVO {
 
     @ApiModelProperty(value = "目的城市")
     private List<Long> objectiveIds;
+
+    @ApiModelProperty(value = "增值服务")
+    private List<Long> types;
+
+    @ApiModelProperty(value = "商品类型")
+    private List<Long> goodsTypes;
 }