手动回滚

src/main/java/com/mmc/oms/service/demand/Impl/DemandReleaseOrderServiceImpl.java

@@ -25,7 +25,6 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
@@ -90,26 +89,21 @@ public class DemandReleaseOrderServiceImpl implements DemandReleaseOrderService
     @Transactional(rollbackFor = Exception.class)
     public ResultBody topUpOrder(CommonPaymentVO commonPaymentVO, String token, Integer userAccountId) {
         // 生成充值订单编号 规则T加时间戳加用户id加随机数4位
-        ResultBody resultBody = null;
-        try {
-            String TOrderNo = "T" + TDateUtil.getDateStr(new Date(), TDateUtil.TYPE) + userAccountId + CodeUtil.getRandomNum(4);
-            OrderRequestParamsVO orderRequestParamsVO = new OrderRequestParamsVO();
-            orderRequestParamsVO.setAmount(commonPaymentVO.getAmount());
-            orderRequestParamsVO.setOrderNo(TOrderNo);
-            orderRequestParamsVO.setDescription("云享金充值");
+        String TOrderNo = "T" + TDateUtil.getDateStr(new Date(), TDateUtil.TYPE) + userAccountId + CodeUtil.getRandomNum(4);
+        OrderRequestParamsVO orderRequestParamsVO = new OrderRequestParamsVO();
+        orderRequestParamsVO.setAmount(commonPaymentVO.getAmount());
+        orderRequestParamsVO.setOrderNo(TOrderNo);
+        orderRequestParamsVO.setDescription("云享金充值");
 //        orderRequestParamsVO.setOrderPort(5);
-            orderRequestParamsVO.setAttach("TOP_UP");
-            TopUpOrderDO topUpOrderDO = new TopUpOrderDO(orderRequestParamsVO, userAccountId);
-            topUpOrderDO.setTradeState("WAIT");
-            topUpOrderDO.setDescription("充值云享金");
-            // 充值订单记录至充值订单表
-            topUpOrderDao.insertTopUpOrder(topUpOrderDO);
-            resultBody = releaseOrder(orderRequestParamsVO, token);
-            if (!"200".equals(resultBody.getCode())) {
-                throw new RuntimeException("调用微信支付方法失败！");
-            }
-        } catch (Exception e) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        orderRequestParamsVO.setAttach("TOP_UP");
+        TopUpOrderDO topUpOrderDO = new TopUpOrderDO(orderRequestParamsVO, userAccountId);
+        topUpOrderDO.setTradeState("WAIT");
+        topUpOrderDO.setDescription("充值云享金");
+        // 充值订单记录至充值订单表
+        topUpOrderDao.insertTopUpOrder(topUpOrderDO);
+        ResultBody resultBody = releaseOrder(orderRequestParamsVO, token);
+        if (!"200".equals(resultBody.getCode())) {
+            throw new RuntimeException("调用微信支付方法失败！");
         }
         return resultBody;
     }