From 295316619cca4dbf4e3e879904ca8ac860358e50 Mon Sep 17 00:00:00 2001
From: yang <2119157836@qq.com>
Date: Thu, 13 Feb 2025 17:55:51 +0800
Subject: [PATCH] =?UTF-8?q?refactor(mcwl-pay):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=8F=90=E7=8E=B0=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=92=8C=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mcwl/pay/service/impl/AliPayServiceImpl.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java
index 3dc8b31..720784e 100644
--- a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java
+++ b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java
@@ -319,6 +319,9 @@ public class AliPayServiceImpl implements AliPayService {
             return R.fail("请先绑定支付宝账号");
         }
 
+        // 添加提现记录和修改用户钱包
+        this.addLogAndUpdateUserWallet(sysUser, amount);
+
         // 收款方信息
         Participant payeeInfo = new Participant();
 
@@ -338,9 +341,7 @@ public class AliPayServiceImpl implements AliPayService {
         System.out.println(response.getBody());
 
         if (response.isSuccess()) {
-            // 记录日志和修改用户钱包
-            this.addLogAndUpdateUserWallet(sysUser, amount);
-            return R.ok("转账成功");
+            return R.ok("提现成功");
         }
 
         if (response.getSubCode().equals("PAYER_BALANCE_NOT_ENOUGH")) {
@@ -349,10 +350,10 @@ public class AliPayServiceImpl implements AliPayService {
 
             String content = String.format("账户余额不足：用户%s提现%s", sysUser.getUserName(), amount);
             MailUtil.send(tos, "上海辰风互娱", content, false);
-            throw new ServiceException("系统繁忙，请稍后重试");
+            throw new ServiceException("网络连接出错,请稍后再试");
         }
-
-        throw new ServiceException("转账失败：" + response.getSubMsg());
+        System.out.println("提现失败：" + response.getSubMsg());
+        throw new ServiceException("提现失败");
     }
 
     @Override