From 095f37ff949a43fe51fdf90a7a5acb2fe508f205 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 22 Sep 2025 21:27:15 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
index 508966a..e873f30 100644
--- a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
@@ -20,6 +20,7 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,7 +72,7 @@
     }
 
 
-    public ServerResponse inMoney(String amt, String payType, HttpServletRequest request) {
+    public ServerResponse inMoney(String amt, String payType, HttpServletRequest request) throws Exception {
         if (StringUtils.isBlank(amt) || StringUtils.isBlank(payType)) {
             return ServerResponse.createByErrorMsg("The parameter cannot be null");
         }
@@ -222,9 +223,8 @@
 
         for (int i = 0; i <userRecharges.size() ; i++) {
           SitePay s =   sitePayMapper.selectById(userRecharges.get(i).getPayId());
-
-            userRecharges.get(i).setAssetsType(EStockType.getEStockTypeByCode(s.getAssetsType()).getSymbol1());
-            userRecharges.get(i).setChannelName(EStockType.getEStockTypeByCode(s.getAssetsType()).getSymbol());
+            userRecharges.get(i).setAssetsType(EStockType.JP.getSymbol1());
+            userRecharges.get(i).setChannelName(EStockType.JP.getSymbol());
         }
 
         return ServerResponse.createBySuccess(pageInfo);
@@ -280,6 +280,7 @@
             User user =  userMapper.selectById(u.getUserId());
             if(user != null){
                 u.setUserPhone(user.getPhone());
+                u.setNickName(user.getRealName());
             }
 
         }
@@ -306,8 +307,7 @@
             if (user == null) {
                 return ServerResponse.createByErrorMsg("用户不存在");
             }
-            SitePay payChnnel = sitePayMapper.selectById(userRecharge.getPayId());
-            userAssetsServices.availablebalanceChange(payChnnel.getAssetsType(),user.getId(), EUserAssets.TOP_UP,userRecharge.getPayAmt(),"","");
+            userAssetsServices.availablebalanceChange(EStockType.JP.getCode(), user.getId(), EUserAssets.TOP_UP,userRecharge.getPayAmt(),"","");
         }
         userRecharge.setOrderStatus(Integer.valueOf((state.intValue() == 1) ? 1 : 2));
         userRecharge.setPayTime(new Date());
@@ -341,21 +341,10 @@
         userRecharge.setPayAmt(new BigDecimal(amt.intValue()));
         userRecharge.setAddTime(new Date());
         userRecharge.setPayTime(new Date());
-
-        if (state.intValue() == 0) {
-            userRecharge.setOrderStatus(Integer.valueOf(0));
-        } else if (state.intValue() == 1) {
-            userRecharge.setOrderSn(payChannel);
-            userRecharge.setPayChannel("2");
-            userRecharge.setOrderStatus(Integer.valueOf(1));
-
-            this.userMapper.updateById(user);
-        } else if (state.intValue() == 2) {
-            userRecharge.setOrderStatus(Integer.valueOf(2));
-        } else {
-            return ServerResponse.createByErrorMsg("订单状态不正确");
-        }
-
+        userRecharge.setOrderStatus(Integer.valueOf(1));
+        userRecharge.setPayId(1);
+        userAssetsServices.availablebalanceChange(EStockType.JP.getCode(),
+                userId,EUserAssets.TOP_UP,new BigDecimal(amt),"","");
         int insertCount = this.userRechargeMapper.insert(userRecharge);
         if (insertCount > 0) {
             return ServerResponse.createBySuccessMsg("生成订单成功!");

--
Gitblit v1.9.3