From d270cf96a8f2886823120cdd64cda0ee88a331ba Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Fri, 23 Aug 2024 20:53:51 +0800
Subject: [PATCH] =?UTF-8?q?```feat(user):=20=E9=9B=86=E6=88=90=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=AE=9D=E5=85=85=E5=80=BC=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

集成支付宝充值功能，允许用户通过支付宝进行余额充值。在用户控制器中添加了处理充值请求的端点，并在用户服务中实现了充值逻辑。使用Alipay SDK处理支付请求，并在成功支付后更新用户的余额。确保用户余额和支付金额的处理在数据库中是原子操作。支付宝配置详细信息已加载，同步和异步通知URL已设置。
```
---
 .../system/controller/SysUserController.java   | 11 +++++++++++
 .../com/muyu/system/mapper/SysUserMapper.java  |  3 +--
 .../muyu/system/service/SysUserService.java    |  3 +++
 .../service/impl/SysUserServiceImpl.java       | 18 +++++++++++++-----
 src/main/resources/bootstrap.yml               |  2 +-
 .../resources/mapper/system/SysUserMapper.xml  |  3 +++
 6 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/muyu/system/controller/SysUserController.java b/src/main/java/com/muyu/system/controller/SysUserController.java
index 92af689..9b16369 100644
--- a/src/main/java/com/muyu/system/controller/SysUserController.java
+++ b/src/main/java/com/muyu/system/controller/SysUserController.java
@@ -269,6 +269,17 @@ public class SysUserController extends BaseController {
         return toAjax(userService.insertBalance(user));
     }
 
+
+    //TODO
+    // 查询当前用户的余额
+    @GetMapping("/balance/{userId}")
+    public Result userBalance(@PathVariable("userId") Long userId){
+        userService.checkUserDataScope(userId);
+        return toAjax(userService.selectBalance(userId));
+    }
+
+
+
     /**
      * 根据用户编号获取授权角色
      */
diff --git a/src/main/java/com/muyu/system/mapper/SysUserMapper.java b/src/main/java/com/muyu/system/mapper/SysUserMapper.java
index 2e96315..b1206af 100644
--- a/src/main/java/com/muyu/system/mapper/SysUserMapper.java
+++ b/src/main/java/com/muyu/system/mapper/SysUserMapper.java
@@ -144,6 +144,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     public SysUser checkEmailUnique (String email);
 
 
-
-
+    public int selectBalance(Long userId);
 }
diff --git a/src/main/java/com/muyu/system/service/SysUserService.java b/src/main/java/com/muyu/system/service/SysUserService.java
index 45792a2..6b67cdf 100644
--- a/src/main/java/com/muyu/system/service/SysUserService.java
+++ b/src/main/java/com/muyu/system/service/SysUserService.java
@@ -227,4 +227,7 @@ public interface SysUserService extends IService<SysUser> {
     public String importUser (List<SysUser> userList, Boolean isUpdateSupport, String operName);
 
     int insertBalance(SysUser user);
+
+
+    int selectBalance(Long userId);
 }
diff --git a/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
index 7259834..be1d7dd 100644
--- a/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
@@ -126,6 +126,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return userMapper.selectUserById(userId);
     }
 
+
+    @Override
+    public int selectBalance(Long userId) {
+        return userMapper.selectBalance(userId);
+    }
+
     /**
      * 查询用户所属角色组
      *
@@ -275,11 +281,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             if (response.isSuccess()) {
                 // 支付成功，更新用户余额
                 SysUser sysUser = userMapper.selectUserById(user.getUserId());
-//                sysUser.setUserBalance(user.getUserBalance());
-                double currentBalance = sysUser.getUserBalance();
-                double newPaymentAmount = user.getPaymentAmount();
-                double newBalance = currentBalance + newPaymentAmount;
-                sysUser.setUserBalance(newBalance);
+                sysUser.setUserBalance(user.getUserBalance());
+//                double currentBalance = sysUser.getUserBalance();
+//                double newPaymentAmount = user.getPaymentAmount();
+//                double newBalance = currentBalance + newPaymentAmount;
+//                sysUser.setUserBalance(newBalance);
                 userMapper.updateUserBalance(sysUser);
             } else {
                 throw new RuntimeException("充值失败");
@@ -290,6 +296,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return 0;
     }
 
+
+
     /**
      * 注册用户信息
      *
diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml
index cd6beea..ba6142e 100644
--- a/src/main/resources/bootstrap.yml
+++ b/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@ nacos:
   addr: 47.116.184.54:8848
   user-name: nacos
   password: nacos
-  namespace: cloud-2112
+  namespace: cloud-tx
 
 # Spring
 spring:
diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index c01177d..039bbe8 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -184,6 +184,9 @@
           and del_flag = '0'
         limit 1
     </select>
+    <select id="selectBalance" resultType="java.lang.Integer">
+           select user_balance from sys_user where user_id = #{userId}
+    </select>
 
     <insert id="insertUser" parameterType="com.muyu.common.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
         insert into sys_user(