From 346c484cbc41fdb3f17ae9e8812a28151712dacc Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 29 Aug 2025 12:41:12 +0800 Subject: [PATCH] =?UTF-8?q?refactor(order):=20=E5=B0=86=20OrderMapper=20?= =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BA=20OrderV2Mapper-=20?= =?UTF-8?q?=E5=B0=86=20OrderMapper=20=E6=8E=A5=E5=8F=A3=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E4=B8=BA=20OrderV2Mapper=20-=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BA=86=E7=9B=B8=E5=85=B3=E6=9C=8D=E5=8A=A1=E7=B1=BB=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=20Mapper=E5=BC=95=E7=94=A8=20-=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86=20OrderServiceImpl=20=E4=B8=AD=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=E4=BB=8E=20orderMapper=E6=94=B9=E4=B8=BA=20o?= =?UTF-8?q?rderV2Mapper=20-=20=E6=9B=B4=E6=96=B0=E4=BA=86=E4=B8=8E?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3=E7=9A=84=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B8=AD=E5=AF=B9=20Mapper=20=E7=9A=84?= =?UTF-8?q?=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{OrderMapper.java => OrderV2Mapper.java} | 2 +- .../order/service/impl/OrderServiceImpl.java | 26 +++++++++---------- .../service/pc/impl/OrderServiceImpl.java | 4 ++- 3 files changed, 17 insertions(+), 15 deletions(-) rename src/main/java/com/ycwl/basic/order/mapper/{OrderMapper.java => OrderV2Mapper.java} (78%) diff --git a/src/main/java/com/ycwl/basic/order/mapper/OrderMapper.java b/src/main/java/com/ycwl/basic/order/mapper/OrderV2Mapper.java similarity index 78% rename from src/main/java/com/ycwl/basic/order/mapper/OrderMapper.java rename to src/main/java/com/ycwl/basic/order/mapper/OrderV2Mapper.java index 624a043..a6031a2 100644 --- a/src/main/java/com/ycwl/basic/order/mapper/OrderMapper.java +++ b/src/main/java/com/ycwl/basic/order/mapper/OrderV2Mapper.java @@ -8,5 +8,5 @@ import org.apache.ibatis.annotations.Mapper; * 订单表Mapper接口 */ @Mapper -public interface OrderMapper extends BaseMapper { +public interface OrderV2Mapper extends BaseMapper { } \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/order/service/impl/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/order/service/impl/OrderServiceImpl.java index 191c372..75cc371 100644 --- a/src/main/java/com/ycwl/basic/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/ycwl/basic/order/service/impl/OrderServiceImpl.java @@ -12,7 +12,7 @@ import com.ycwl.basic.order.entity.OrderV2; import com.ycwl.basic.order.enums.*; import com.ycwl.basic.order.mapper.OrderDiscountMapper; import com.ycwl.basic.order.mapper.OrderItemMapper; -import com.ycwl.basic.order.mapper.OrderMapper; +import com.ycwl.basic.order.mapper.OrderV2Mapper; import com.ycwl.basic.order.mapper.OrderRefundMapper; import com.ycwl.basic.order.service.IOrderService; import com.ycwl.basic.order.event.*; @@ -39,7 +39,7 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class OrderServiceImpl implements IOrderService { - private final OrderMapper orderMapper; + private final OrderV2Mapper orderV2Mapper; private final OrderItemMapper orderItemMapper; private final OrderDiscountMapper orderDiscountMapper; private final OrderRefundMapper orderRefundMapper; @@ -78,7 +78,7 @@ public class OrderServiceImpl implements IOrderService { order.setDeleted(0); // 保存订单 - orderMapper.insert(order); + orderV2Mapper.insert(order); Long orderId = order.getId(); log.info("订单基础信息创建成功: orderId={}, orderNo={}", orderId, orderNo); @@ -168,12 +168,12 @@ public class OrderServiceImpl implements IOrderService { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_no", orderNo); queryWrapper.eq("deleted", 0); - return orderMapper.selectOne(queryWrapper); + return orderV2Mapper.selectOne(queryWrapper); } @Override public OrderV2 getById(Long orderId) { - return orderMapper.selectById(orderId); + return orderV2Mapper.selectById(orderId); } @Override @@ -192,7 +192,7 @@ public class OrderServiceImpl implements IOrderService { order.setCompleteTime(new Date()); } - return orderMapper.updateById(order) > 0; + return orderV2Mapper.updateById(order) > 0; } @Override @@ -219,7 +219,7 @@ public class OrderServiceImpl implements IOrderService { PageHelper.startPage(request.getPageNum(), request.getPageSize()); QueryWrapper queryWrapper = buildOrderQueryWrapper(request); - List orders = orderMapper.selectList(queryWrapper); + List orders = orderV2Mapper.selectList(queryWrapper); // 转换为响应DTO List responseList = orders.stream() @@ -232,7 +232,7 @@ public class OrderServiceImpl implements IOrderService { @Override public OrderV2DetailResponse getOrderDetail(Long orderId) { // 查询订单基础信息 - OrderV2 order = orderMapper.selectById(orderId); + OrderV2 order = orderV2Mapper.selectById(orderId); if (order == null || order.getDeleted() == 1) { return null; } @@ -264,14 +264,14 @@ public class OrderServiceImpl implements IOrderService { order.setRemarks(remarks); order.setUpdateTime(new Date()); - return orderMapper.updateById(order) > 0; + return orderV2Mapper.updateById(order) > 0; } @Override @Transactional public boolean updatePaymentStatus(Long orderId, String paymentStatus) { // 先查询当前订单状态 - OrderV2 currentOrder = orderMapper.selectById(orderId); + OrderV2 currentOrder = orderV2Mapper.selectById(orderId); if (currentOrder == null) { log.warn("订单不存在: orderId={}", orderId); return false; @@ -292,7 +292,7 @@ public class OrderServiceImpl implements IOrderService { order.setOrderStatus(OrderStatus.PAID); } - boolean success = orderMapper.updateById(order) > 0; + boolean success = orderV2Mapper.updateById(order) > 0; // 发布支付状态变更事件 if (success && !oldPaymentStatus.equals(newPaymentStatus)) { @@ -311,7 +311,7 @@ public class OrderServiceImpl implements IOrderService { @Transactional public boolean updateRefundStatus(Long orderId, RefundStatus refundStatus) { // 先查询当前订单状态 - OrderV2 currentOrder = orderMapper.selectById(orderId); + OrderV2 currentOrder = orderV2Mapper.selectById(orderId); if (currentOrder == null) { log.warn("订单不存在: orderId={}", orderId); return false; @@ -332,7 +332,7 @@ public class OrderServiceImpl implements IOrderService { order.setOrderStatus(OrderStatus.REFUNDING); } - boolean success = orderMapper.updateById(order) > 0; + boolean success = orderV2Mapper.updateById(order) > 0; // 发布退款状态变更事件 if (success && !oldRefundStatus.equals(refundStatus)) { diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java index 1832c1c..6c12663 100644 --- a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java @@ -57,6 +57,7 @@ import com.ycwl.basic.utils.SnowFlakeUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.ScopedProxyMode; import org.springframework.stereotype.Service; @@ -78,7 +79,7 @@ import java.util.stream.Collectors; * @Date：2024/12/3 13:54 */ @Slf4j -@Service +@Service("OrderServiceOldImpl") @Scope(proxyMode = ScopedProxyMode.TARGET_CLASS) public class OrderServiceImpl implements OrderService { @@ -86,6 +87,7 @@ public class OrderServiceImpl implements OrderService { private OrderMapper orderMapper; @Autowired + @Qualifier(value = "OrderServiceOldImpl") private OrderServiceImpl self; @Autowired private SourceMapper sourceMapper;