diff --git a/src/main/java/com/muyu/system/controller/SysUserController.java b/src/main/java/com/muyu/system/controller/SysUserController.java index 9891f4a..b2b6d95 100644 --- a/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/src/main/java/com/muyu/system/controller/SysUserController.java @@ -257,20 +257,6 @@ public class SysUserController extends BaseController { } - //TODO 用户充值 - /** - * 用户充值 - */ - @Log(title = "用户充值", businessType = BusinessType.INSERT) - @PostMapping ("/alipay/recharge") - public Result userBalance(@RequestBody SysUser user){ - userService.checkUserAllowed(user); - userService.checkUserDataScope(user.getUserId()); - user.setCreateBy(SecurityUtils.getUsername()); - return toAjax(userService.insertBalance(user)); - } - - //TODO // 查询当前用户的余额 @GetMapping("/balance/{userId}") diff --git a/src/main/java/com/muyu/system/mapper/SysUserMapper.java b/src/main/java/com/muyu/system/mapper/SysUserMapper.java index 38245a9..0cac370 100644 --- a/src/main/java/com/muyu/system/mapper/SysUserMapper.java +++ b/src/main/java/com/muyu/system/mapper/SysUserMapper.java @@ -76,7 +76,7 @@ public interface SysUserMapper extends BaseMapper { */ public int updateUser (SysUser user); - public int updateUserBalance (SysUser user); + /** diff --git a/src/main/java/com/muyu/system/service/SysUserService.java b/src/main/java/com/muyu/system/service/SysUserService.java index d7da17e..07cbf50 100644 --- a/src/main/java/com/muyu/system/service/SysUserService.java +++ b/src/main/java/com/muyu/system/service/SysUserService.java @@ -227,7 +227,7 @@ public interface SysUserService extends IService { */ public String importUser (List userList, Boolean isUpdateSupport, String operName); - int insertBalance(SysUser user); + BigDecimal 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 481c080..264910c 100644 --- a/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -275,38 +275,9 @@ public class SysUserServiceImpl extends ServiceImpl impl - @Override - @Transactional(rollbackFor = Exception.class) - public int insertBalance(SysUser user) { - // 创建支付宝客户端 - AlipayClient alipayClient = new DefaultAlipayClient(URL, APPID, RSA_PRIVATE_KEY, FORMAT, CHARSET, ALIPAY_PUBLIC_KEY, SIGNTYPE); - AlipayTradePagePayRequest alipayRequest = new AlipayTradePagePayRequest(); - // 发起支付请求 - try { - //TODO 调用支付宝接口 - AlipayTradePagePayResponse response = alipayClient.pageExecute(alipayRequest); - 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); - userMapper.updateUserBalance(sysUser); - } else { - throw new RuntimeException("充值失败"); - } - } catch (Exception e) { - e.printStackTrace(); - } - return 0; - } - - /** * 注册用户信息 diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml index be46325..f95e784 100644 --- a/src/main/resources/mapper/system/SysUserMapper.xml +++ b/src/main/resources/mapper/system/SysUserMapper.xml @@ -250,28 +250,7 @@ - - update sys_user - - dept_id = #{deptId}, - user_name = #{userName}, - nick_name = #{nickName}, - email = #{email}, - phonenumber = #{phonenumber}, - sex = #{sex}, - avatar = #{avatar}, - password = #{password}, - status = #{status}, - login_ip = #{loginIp}, - login_date = #{loginDate}, - update_by = #{updateBy}, - user_balance = #{userBalance}, - payment_amount = #{paymentAmount}, - remark = #{remark}, - update_time = sysdate() - - where user_id = #{userId} - + update sys_user