refactor(order):优化订单模块代码结构与查询功能

- 新增订单项BO中的订单状态字段并关联枚举类型
- 在OrderItemMapper.xml中添加根据订单状态查询的条件判断
- 调整了部分包导入顺序以符合编码规范

ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderItemBo.java

@@ -2,6 +2,7 @@ package com.wzj.soopin.order.domain.bo;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.wzj.soopin.order.domain.entity.OrderItem;
+import com.wzj.soopin.order.emum.OrderStatusEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.dromara.common.core.domain.BaseBO;
@@ -50,6 +51,13 @@ public class OrderItemBo extends BaseBO <OrderItem> {
     @Schema(description = "商户租户id", hidden = true)
     private String tenantId;
 
+    /**
+     * 订单状态
+     * @see OrderStatusEnum#getValue()
+     */
+    @Schema(description = "订单状态", implementation = OrderStatusEnum.class)
+    private Long orderStatus;
+
     public LambdaQueryWrapper<OrderItem> toWrapper() {
         return new LambdaQueryWrapper<OrderItem>()
             .eq(orderId != null, OrderItem::getOrderId, orderId)

ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java

@@ -1,6 +1,7 @@
 package com.wzj.soopin.order.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.wzj.soopin.order.emum.OrderStatusEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import org.dromara.common.core.domain.model.BaseAudit;
@@ -73,8 +74,10 @@ public class Order extends BaseAudit implements Serializable {
 
 
     /**
-     *  订单状态枚举类型见{@link com.wzj.soopin.order.emum.OrderStatusEnum}
+     *  订单状态
+     *  @see OrderStatusEnum#getValue()
      */
+    @Schema(description = "订单状", implementation = OrderStatusEnum.class)
     private Integer status;
 
     /**

ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/MemberOrderServiceImpl.java

@@ -1,10 +1,8 @@
 package com.wzj.soopin.order.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wzj.soopin.goods.domain.entity.Sku;
 import com.wzj.soopin.goods.mapper.SkuMapper;
 import com.wzj.soopin.order.convert.OrderConvert;
 import com.wzj.soopin.order.convert.OrderItemConvert;
@@ -17,12 +15,9 @@ import com.wzj.soopin.order.mapper.OrderMapper;
 import com.wzj.soopin.order.service.IMemberOrderService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

ruoyi-modules/ruoyi-order/src/main/resources/mapper/OrderItemMapper.xml

@@ -103,6 +103,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.orderId != null">
             AND o.id = #{query.orderId}
         </if>
+        <if test="query.orderStatus != null">
+            AND o.status = #{query.orderStatus}
+        </if>
         <if test="query.productId != null">
             AND oi.product_id = #{query.productId}
         </if>