From 96e443a77b1d425d3e536c288fc271fe182f1496 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 18 Jul 2025 18:31:44 +0800
Subject: [PATCH] app股票列表修改

---
 src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java |   58 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
index ac0d600..26c3b6c 100644
--- a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
@@ -151,7 +151,7 @@
     }
 
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ServerResponse chargeSuccess(UserRecharge userRecharge) throws Exception {
         log.info("充值订单 确认成功操作 id = {}", userRecharge.getId());
 
@@ -290,7 +290,7 @@
     }
 
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ServerResponse updateState(Integer chargeId, Integer state) throws Exception {
         UserRecharge userRecharge = this.userRechargeMapper.selectById(chargeId);
 
@@ -325,32 +325,36 @@
             return ServerResponse.createByErrorMsg("参数不能为空");
         }
 
-        User user = this.userMapper.selectById(userId);
-        if (user == null) {
-            return ServerResponse.createByErrorMsg("找不到用户");
+        try {
+            User user = this.userMapper.selectById(userId);
+            if (user == null) {
+                return ServerResponse.createByErrorMsg("找不到用户");
+            }
+
+            UserRecharge userRecharge = new UserRecharge();
+            userRecharge.setUserId(user.getId());
+            userRecharge.setNickName(user.getRealName());
+            userRecharge.setAgentId(user.getAgentId());
+
+            String ordersn = KeyUtils.getRechargeOrderSn();
+            userRecharge.setOrderSn(ordersn);
+
+            userRecharge.setPayChannel(payChannel);
+            userRecharge.setPayAmt(new BigDecimal(amt.intValue()));
+            userRecharge.setAddTime(new Date());
+            userRecharge.setPayTime(new Date());
+            userRecharge.setOrderStatus(Integer.valueOf(1));
+            userRecharge.setPayId(1);
+            userAssetsServices.availablebalanceChange(EStockType.MX.getCode(),
+                    userId,EUserAssets.TOP_UP,new BigDecimal(amt),"","");
+            int insertCount = this.userRechargeMapper.insert(userRecharge);
+            if (insertCount > 0) {
+                return ServerResponse.createBySuccessMsg("生成订单成功!");
+            }
+            return ServerResponse.createByErrorMsg("生成订单失败,请重试");
+        } catch (Exception e) {
+            return ServerResponse.createByErrorMsg(e.getMessage());
         }
-
-        UserRecharge userRecharge = new UserRecharge();
-        userRecharge.setUserId(user.getId());
-        userRecharge.setNickName(user.getRealName());
-        userRecharge.setAgentId(user.getAgentId());
-
-        String ordersn = KeyUtils.getRechargeOrderSn();
-        userRecharge.setOrderSn(ordersn);
-
-        userRecharge.setPayChannel(payChannel);
-        userRecharge.setPayAmt(new BigDecimal(amt.intValue()));
-        userRecharge.setAddTime(new Date());
-        userRecharge.setPayTime(new Date());
-        userRecharge.setOrderStatus(Integer.valueOf(1));
-        userRecharge.setPayId(1);
-        userAssetsServices.availablebalanceChange(EStockType.MX.getCode(),
-                userId,EUserAssets.TOP_UP,new BigDecimal(amt),"","");
-        int insertCount = this.userRechargeMapper.insert(userRecharge);
-        if (insertCount > 0) {
-            return ServerResponse.createBySuccessMsg("生成订单成功!");
-        }
-        return ServerResponse.createByErrorMsg("生成订单失败,请重试");
     }
 
 

--
Gitblit v1.9.3