销售订单问题处理

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/order/dto/OrderInfoSelectDto.java

@@ -17,7 +17,7 @@ public class OrderInfoSelectDto extends BaseSelectDto {
     /**
      * 销售订单类型
      */
-    private Integer type;
+    private String type;
 
     /**
      * 销售订单状态

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/order/impl/OrderInfoServiceImpl.java

@@ -64,12 +64,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     public Page<OrderInfoVo> getPage(OrderInfoSelectDto dto) {
         IWrapper<OrderInfo> wrapper = getWrapper();
         wrapper.like(OrderInfo::getCode, dto.getKeyword());
-        if (ObjectUtil.isEmpty(dto.getType())) {
-            //默认销售订单
-            wrapper.in("oi", OrderInfo::getType, 1, 2);
-        } else {
+//        if (ObjectUtil.isEmpty(dto.getType())) {
+//            //默认销售订单
+//            wrapper.in("oi", OrderInfo::getType, 1, 2);
+//        } else {
             wrapper.eq("oi", OrderInfo::getType, dto.getType());
-        }
+//        }
         wrapper.eq("oi", OrderInfo::getStatus, dto.getStatus());//根据状态过滤
         wrapper.orderByDesc("oi", OrderInfo::getId);
         Page<OrderInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);