From 097be94690a981b1b7317aee1861c632d00dc51a Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Sun, 31 Aug 2025 16:37:56 +0800
Subject: [PATCH] 修改客服地址

---
 src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java |   44 +++++++++++++++++++-------------------------
 1 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
index 280d90e..e873f30 100644
--- a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
@@ -2,6 +2,7 @@
 
 
 import com.nq.dao.*;
+import com.nq.enums.EStockType;
 import com.nq.enums.EUserAssets;
 import com.nq.pojo.*;
 import com.nq.service.*;
@@ -19,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;
@@ -70,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");
         }
@@ -221,13 +223,8 @@
 
         for (int i = 0; i <userRecharges.size() ; i++) {
           SitePay s =   sitePayMapper.selectById(userRecharges.get(i).getPayId());
-          if(s.getAssetsType().equals("US")){
-              userRecharges.get(i).setAssetsType("$");
-              userRecharges.get(i).setChannelName("USD");
-          }else{
-              userRecharges.get(i).setAssetsType("RM");
-              userRecharges.get(i).setChannelName("MYR");
-          }
+            userRecharges.get(i).setAssetsType(EStockType.JP.getSymbol1());
+            userRecharges.get(i).setChannelName(EStockType.JP.getSymbol());
         }
 
         return ServerResponse.createBySuccess(pageInfo);
@@ -278,6 +275,15 @@
 
 
         List<UserRecharge> userRecharges = this.userRechargeMapper.listByAdmin(agentId, userId, realName, state, begin_time, end_time);
+        for (int i = 0; i < userRecharges.size(); i++) {
+            UserRecharge u =userRecharges.get(i);
+            User user =  userMapper.selectById(u.getUserId());
+            if(user != null){
+                u.setUserPhone(user.getPhone());
+                u.setNickName(user.getRealName());
+            }
+
+        }
         PageInfo pageInfo = new PageInfo(userRecharges);
 
         return ServerResponse.createBySuccess(pageInfo);
@@ -301,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());
@@ -336,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