refactor(order): 将 OrderMapper 重命名为 OrderV2Mapper- 将 OrderMapper 接口重命名为 OrderV2Mapper

- 更新了相关服务类中的 Mapper引用
- 修改了 OrderServiceImpl 中的字段名从 orderMapper改为 orderV2Mapper
- 更新了与订单相关的所有方法中对 Mapper 的调用
This commit is contained in:
2025-08-29 12:41:12 +08:00
parent e95e0a04ff
commit 346c484cbc
3 changed files with 17 additions and 15 deletions

View File

@@ -8,5 +8,5 @@ import org.apache.ibatis.annotations.Mapper;
* 订单表Mapper接口
*/
@Mapper
public interface OrderMapper extends BaseMapper<OrderV2> {
public interface OrderV2Mapper extends BaseMapper<OrderV2> {
}

View File

@@ -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<OrderV2> 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<OrderV2> queryWrapper = buildOrderQueryWrapper(request);
List<OrderV2> orders = orderMapper.selectList(queryWrapper);
List<OrderV2> orders = orderV2Mapper.selectList(queryWrapper);
// 转换为响应DTO
List<OrderV2ListResponse> 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)) {