From e031959940a80792a60e2d8b83499cd168fa83d6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 三月 2026 17:18:18 +0800
Subject: [PATCH] 修改事务注解

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index d257b52..db3f47e 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -93,6 +93,8 @@
 import com.xiaopeng.order.vo.OrderDetailVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
+import org.apache.shardingsphere.transaction.core.TransactionType;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -491,8 +493,10 @@
         return new HashMap<>();
     }
 
-    @Transactional(rollbackFor = Exception.class)
+
     @Override
+    @Transactional
+    @ShardingSphereTransactionType(TransactionType.BASE)
     public void cancelOrCloseOrder(Long orderId, Integer type) {
         // 1. 校验订单是否存在
         XpOrder order = this.getById(orderId);
@@ -686,8 +690,9 @@
     /**
      * 改派订单
      */
-    @Transactional(rollbackFor = Exception.class)
     @Override
+    @Transactional
+    @ShardingSphereTransactionType(TransactionType.BASE)
     public void reassignOrder(Long orderId, Long newVehicleId, String reassignReason) {
         // 1. 校验订单是否存在
         XpOrder order = this.getById(orderId);
@@ -1114,6 +1119,7 @@
      */
     @Override
     @Transactional
+    @ShardingSphereTransactionType(TransactionType.BASE)
     public void cancelOrder(Long orderId, String uid) {
         XpOrder order = this.getById(orderId);
         if (order.getStatus() == 0) {
@@ -1227,6 +1233,7 @@
 
     @Override
     @Transactional
+    @ShardingSphereTransactionType(TransactionType.BASE)
     public void cancelOrder(String orderId) {
         XpOrder order = this.getById(orderId);
         if (order == null) {
@@ -1287,6 +1294,7 @@
      */
     @Override
     @Transactional
+    @ShardingSphereTransactionType(TransactionType.BASE)
     public void comment(XpOrderCommentDto dto, String uid) {
         XpOrder xpOrder = this.getById(dto.getOrderId());
         if (xpOrder == null) {
@@ -2347,8 +2355,8 @@
      * @param dto
      */
     @Override
-//    @Transactional
-//    @ShardingSphereTransactionType(TransactionType.BASE)
+    @Transactional
+    @ShardingSphereTransactionType(TransactionType.BASE)
     public void popOrder(PopOrderDto dto) {
         String orderType = dto.getOrderType();
         Long orderId = dto.getOrderId();

--
Gitblit v1.7.1