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 { 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 { public String importUser (List 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 impl return userMapper.selectUserById(userId); } + + @Override + public int selectBalance(Long userId) { + return userMapper.selectBalance(userId); + } + /** * 查询用户所属角色组 * @@ -275,11 +281,11 @@ public class SysUserServiceImpl extends ServiceImpl 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 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 + insert into sys_user(