From d3f714561021b9d0874ca03ff68374655d5179af Mon Sep 17 00:00:00 2001 From: huk Date: Fri, 26 Sep 2025 16:54:16 +0800 Subject: [PATCH] =?UTF-8?q?refactor(order):=E4=BC=98=E5=8C=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E4=B8=8E=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增订单项BO中的订单状态字段并关联枚举类型 - 在OrderItemMapper.xml中添加根据订单状态查询的条件判断 - 调整了部分包导入顺序以符合编码规范 --- .../java/com/wzj/soopin/order/domain/bo/OrderItemBo.java | 8 ++++++++ .../java/com/wzj/soopin/order/domain/entity/Order.java | 5 ++++- .../soopin/order/service/impl/MemberOrderServiceImpl.java | 5 ----- .../src/main/resources/mapper/OrderItemMapper.xml | 3 +++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderItemBo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderItemBo.java index b0f3983c6..278e2c174 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderItemBo.java +++ b/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 { @Schema(description = "商户租户id", hidden = true) private String tenantId; + /** + * 订单状态 + * @see OrderStatusEnum#getValue() + */ + @Schema(description = "订单状态", implementation = OrderStatusEnum.class) + private Long orderStatus; + public LambdaQueryWrapper toWrapper() { return new LambdaQueryWrapper() .eq(orderId != null, OrderItem::getOrderId, orderId) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java index 9dd64ea41..3a977277e 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java +++ b/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; /** diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/MemberOrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/MemberOrderServiceImpl.java index 87a405035..45863ca68 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/MemberOrderServiceImpl.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/OrderItemMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/OrderItemMapper.xml index 52baef1b4..bbd68659a 100644 --- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/OrderItemMapper.xml +++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/OrderItemMapper.xml @@ -103,6 +103,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND o.id = #{query.orderId} + + AND o.status = #{query.orderStatus} + AND oi.product_id = #{query.productId}