From 006173ff944f520759a013678e978f484337da77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com>
Date: Mon, 28 Apr 2025 17:36:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E8=BD=A6=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverydemand/service/impl/DeliveryDemandServiceImpl.java  | 2 +-
 .../vehicledemand/service/impl/VehicleDemandServiceImpl.java    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java
index d8161dc..fb7170a 100644
--- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java
+++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java
@@ -39,7 +39,7 @@ public class DeliveryDemandServiceImpl extends ServiceImpl<DeliveryDemandMapper,
     private final TmsVehicleProductMapper vehicleProductMapper;
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public Result<?> handleMerge(List<String> ids) {
         List<DeliveryDemand> deliveryDemands = deliveryDemandMapper.selectBatchIds(ids);
         boolean hasEven = deliveryDemands.stream().anyMatch(item -> "0".equals(item.getShipType()));
diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/service/impl/VehicleDemandServiceImpl.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/service/impl/VehicleDemandServiceImpl.java
index 781f44b..eb52005 100644
--- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/service/impl/VehicleDemandServiceImpl.java
+++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/service/impl/VehicleDemandServiceImpl.java
@@ -19,6 +19,7 @@ import org.jeecg.modules.tms.outbound.vehicledemandcount.service.IVehicleDemandC
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -40,6 +41,7 @@ public class VehicleDemandServiceImpl extends ServiceImpl<VehicleDemandMapper, V
     private final DeliveryDemandMapper deliveryDemandMapper;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result<?> carCount(VehicleDemand vehicleDemand) {
         // 1.判断是否进行过用车计算
         LambdaQueryWrapper<VehicleDemandCount> countLambdaQueryWrapper = new LambdaQueryWrapper<>();