From 57c2b6875b5f026a1432f3209471d6b4503f43fc Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 29 Oct 2024 13:35:05 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index a3beb29..1383e9c 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -149,28 +149,33 @@
             if(type == 0){
                 userWithdraw.setBankNo(userBank.getBankNo());
                 userWithdraw.setBankName(userBank.getBankName());
+                userWithdraw.setBranch("银行卡");
+                userWithdraw.setPayeeName(userBank.getPayeeName());
                 userWithdraw.setBankAddress("银行卡");
             }else{
                 userWithdraw.setBankNo(walletAddress);
+                userWithdraw.setPayeeName("加密货币");
                 userWithdraw.setBankName("加密货币");
+                userWithdraw.setBranch("加密货币");
                 userWithdraw.setBankAddress("加密货币");
             }
+
+            userWithdraw.setBranchNo(userBank.getBranchNo());
+
             userWithdraw.setWithStatus(Integer.valueOf(0));
             BigDecimal withfee = siteSetting.getWithFeePercent().multiply(new BigDecimal(amt)).add(new BigDecimal(siteSetting.getWithFeeSingle().intValue()));
             userWithdraw.setWithFee(withfee);
             userWithdraw.setAssetsType(accsetType);
+            log.info("userWithdraw------------:"+userWithdraw.toString());
+            log.info("userBank--------------:"+userBank.toString());
             int insertCount = this.userWithdrawMapper.insert(userWithdraw);
             if (insertCount > 0) {
                 return ServerResponse.createBySuccessMsg("提现成功",request);
             }
-
-            log.error("保存提现记录失败");
-
-            throw new Exception("用户提现,保存提现记录失败");
         } else {
             return ServerResponse.createByErrorMsg("提现密码不正确!",request);
         }
-
+        return ServerResponse.createBySuccessMsg("提现成功",request);
     }
 
 
@@ -235,7 +240,7 @@
             User user = this.userMapper.selectById(userWithdraw.getUserId());
 
 
-            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("JP", user.getId());
+            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(userWithdraw.getAssetsType(), user.getId());
             if (userAssets == null) {
                 return ServerResponse.createByErrorMsg("用户资金账户不存在");
             }
@@ -348,7 +353,7 @@
             if (user == null) {
                 return ServerResponse.createByErrorMsg("用户不存在");
             }
-            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("JP", user.getId());
+            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(userWithdraw.getAssetsType(), user.getId());
             if (userAssets == null) {
                 return ServerResponse.createByErrorMsg("用户资金账户不存在");
             }

--
Gitblit v1.9.3