事务调整

sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwoTradeOrderController.java

@@ -136,7 +136,7 @@ public class KwoTradeOrderController {
 
     @PostMapping("/audit")
     @Operation(summary = "审核贸易订单", description = "审核贸易订单")
-    @GlobalTransactional(name = "default_tx_group")
+//    @GlobalTransactional(name = "default_tx_group")
     @RepeatSubmit(interval = 1000, message = "前方拥堵，请稍后尝试")
     public HttpResult audit(@RequestBody @Validated TradeOrderAuditParam tradeOrderAuditParam) {
         return HttpResult.ok("贸易订单审核成功", kwoTradeOrderService.auditOrder(tradeOrderAuditParam));
@@ -144,7 +144,7 @@ public class KwoTradeOrderController {
 
     @PostMapping("/settle")
     @Operation(summary = "贸易订单手动完结", description = "贸易订单手动完结")
-    @GlobalTransactional(name = "default_tx_group")
+//    @GlobalTransactional(name = "default_tx_group")
     @RepeatSubmit(interval = 1000, message = "前方拥堵，请稍后尝试")
     public HttpResult settle(@RequestBody @Validated TradeOrderSettleParam tradeOrderSettleParam) {
         return HttpResult.ok("手动完结成功", kwoTradeOrderService.settleOrder(tradeOrderSettleParam));

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -2394,6 +2394,7 @@ public class KwoTradeOrderService {
      * @param tradeOrderAuditParam
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public Object auditOrder(TradeOrderAuditParam tradeOrderAuditParam) {
         KwoTradeOrder kwoTradeOrder = kwoTradeOrderMapper.selectOne(new LambdaQueryWrapper<KwoTradeOrder>().eq(KwoTradeOrder::getId, tradeOrderAuditParam.getId()).eq(KwoTradeOrder::getDelFlag, 0));
         if (Objects.isNull(kwoTradeOrder)) {
@@ -2783,6 +2784,7 @@ public class KwoTradeOrderService {
      * @param tradeOrderSettleParam
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public Object settleOrder(TradeOrderSettleParam tradeOrderSettleParam) {
         KwoTradeOrder kwoTradeOrder = new KwoTradeOrder();
         KwoTradeOrder kwoTradeOrderDB = kwoTradeOrderMapper.selectOne(new LambdaQueryWrapper<KwoTradeOrder>().eq(KwoTradeOrder::getId, tradeOrderSettleParam.getId()).eq(KwoTradeOrder::getDelFlag, 0));