查询订单列表的状态字段改成列表

src/main/java/com/sczx/order/dto/OrderQueryReq.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author: 张黎
  * @Date: 2025/07/30/16:02
@@ -21,5 +23,5 @@ public class OrderQueryReq {
     private Long customerId;
 
     @ApiModelProperty("订单状态")
-    private OrderStatusEnum orderStatus;
+    private List<OrderStatusEnum> orderStatusList;
 }

src/main/java/com/sczx/order/mapper/OrderMainMapper.java

@@ -8,6 +8,8 @@ import com.sczx.order.po.OrderMainPO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 租车订单信息 Mapper 接口
@@ -19,5 +21,5 @@ import org.apache.ibatis.annotations.Param;
 public interface OrderMainMapper extends BaseMapper<OrderMainPO> {
     StoreOrderStatisticsDTO storeOrderStatistics(@Param("storeId") Long storeId);
 
-    IPage<OrderSimpleDTO> pageQueryOrder(Page<OrderSimpleDTO> page, @Param("customerId") Long customerId, @Param("storeId") Long storeId, @Param("orderStatus") String orderStatus);
+    IPage<OrderSimpleDTO> pageQueryOrder(Page<OrderSimpleDTO> page, @Param("customerId") Long customerId, @Param("storeId") Long storeId, @Param("orderStatusList") List<String> orderStatusList);
 }

src/main/java/com/sczx/order/repository/OrderMainRepo.java

@@ -6,6 +6,8 @@ import com.sczx.order.dto.StoreOrderStatisticsDTO;
 import com.sczx.order.po.OrderMainPO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 租车订单信息 服务类
@@ -24,8 +26,8 @@ public interface OrderMainRepo extends IService<OrderMainPO> {
      * @param pageSize     每页条数
      * @param customerId   客户ID
      * @param storeId      门店ID
-     * @param orderStatus  订单状态
+     * @param orderStatusList  订单状态
      * @return
      */
-    IPage<OrderSimpleDTO> pageQueryOrder(Integer pageNo, Integer pageSize, Long customerId, Long storeId, String orderStatus);
+    IPage<OrderSimpleDTO> pageQueryOrder(Integer pageNo, Integer pageSize, Long customerId, Long storeId, List<String> orderStatusList);
 }

src/main/java/com/sczx/order/repository/impl/OrderMainRepoImpl.java

@@ -10,6 +10,8 @@ import com.sczx.order.repository.OrderMainRepo;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 租车订单信息 服务实现类
@@ -27,8 +29,8 @@ public class OrderMainRepoImpl extends ServiceImpl<OrderMainMapper, OrderMainPO>
     }
 
     @Override
-    public IPage<OrderSimpleDTO> pageQueryOrder(Integer pageNo, Integer pageSize, Long customerId, Long storeId, String orderStatus) {
+    public IPage<OrderSimpleDTO> pageQueryOrder(Integer pageNo, Integer pageSize, Long customerId, Long storeId, List<String> orderStatusList) {
         Page<OrderSimpleDTO> page = new Page<>(pageNo, pageSize);
-        return this.getBaseMapper().pageQueryOrder(page, customerId, storeId, orderStatus);
+        return this.getBaseMapper().pageQueryOrder(page, customerId, storeId, orderStatusList);
     }
 }

src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java

@@ -36,6 +36,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -276,13 +277,14 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public IPage<OrderSimpleDTO> pageCustOrder(Integer pageNo, Integer pageSize, OrderQueryReq orderQueryReq) {
         orderQueryReq.setCustomerId(Long.valueOf(jwtUtil.getUserInfoFromToken().getUserId().toString()));
-        String orderStatusCode = orderQueryReq.getOrderStatus() == null ? null : orderQueryReq.getOrderStatus().getCode();
+        List<String> orderStatusList = orderQueryReq.getOrderStatusList().stream().map(OrderStatusEnum::getCode).collect(Collectors.toList());
-        return orderMainRepo.pageQueryOrder(pageNo, pageSize, orderQueryReq.getCustomerId(), orderQueryReq.getStoreId(), orderStatusCode);
+        return orderMainRepo.pageQueryOrder(pageNo, pageSize, orderQueryReq.getCustomerId(), orderQueryReq.getStoreId(), orderStatusList);
     }
 
     @Override
     public IPage<OrderSimpleDTO> pageStoreOrder(Integer pageNo, Integer pageSize, OrderQueryReq orderQueryReq) {
-        String orderStatusCode = orderQueryReq.getOrderStatus() == null ? null : orderQueryReq.getOrderStatus().getCode();
+
-        return orderMainRepo.pageQueryOrder(pageNo, pageSize, orderQueryReq.getCustomerId(), orderQueryReq.getStoreId(), orderStatusCode);
+        List<String> orderStatusList = orderQueryReq.getOrderStatusList().stream().map(OrderStatusEnum::getCode).collect(Collectors.toList());
+        return orderMainRepo.pageQueryOrder(pageNo, pageSize, orderQueryReq.getCustomerId(), orderQueryReq.getStoreId(), orderStatusList);
     }
 }

src/main/resources/mapper/OrderMainMapper.xml

@@ -43,8 +43,11 @@
             <if test="storeId != null">
                 and o.store_id = #{storeId}
             </if>
-            <if test="orderStatus != null and orderStatus!= ''">
+            <if test="orderStatusList != null and orderStatusList.size() > 0">
-                and o.order_status = #{orderStatus}
+                and o.order_status in
+                <foreach collection="orderStatusList" item="orderStatus" open="(" separator="," close=")">
+                    #{orderStatus}
+                </foreach>
             </if>
         </where>
         order by o.update_time desc