1

zj

2024-10-07 250c7fc3374707e6d9506246c3fe855165e6ef41

1

 src/main/java/com/nq/service/impl/UserAssetsServices.java

@@ -211,6 +211,7 @@
           }
        }else if(Objects.equals(eUserAssets.getCode(), EUserAssets.WITHDRAW.getCode())){
            userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
            userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.abs()));
        }else if(Objects.equals(eUserAssets.getCode(), EUserAssets.HANDLING_CHARGE.getCode())){
           userAssets.setHandlingCharge(userAssets.getHandlingCharge().add(amount.abs()));
           userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));

 src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java

@@ -241,6 +241,7 @@
                return ServerResponse.createByErrorMsg("用户资金账户不存在");
            }
            userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
            userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
            int updateUserCount = userAssetsMapper.updateById(userAssets);

            if (updateUserCount > 0) {
@@ -342,18 +343,19 @@
        if (state.intValue() == 3 &&
                StringUtils.isBlank(authMsg)) {
            return ServerResponse.createByErrorMsg("失败信息必填");

        }
        User user = this.userMapper.selectById(userWithdraw.getUserId());
        if (user == null) {
            return ServerResponse.createByErrorMsg("用户不存在");
        }
        UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", user.getId());
        if (userAssets == null) {
            return ServerResponse.createByErrorMsg("用户资金账户不存在");
        }
        if (state == 3) {
            User user = this.userMapper.selectById(userWithdraw.getUserId());
            if (user == null) {
                return ServerResponse.createByErrorMsg("用户不存在");
            }
            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", user.getId());
            if (userAssets == null) {
                return ServerResponse.createByErrorMsg("用户资金账户不存在");
            }

            userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
            userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
            int updateCount = userAssetsMapper.updateById(userAssets);
            if (updateCount > 0) {
                log.info("提现失败，返还用户资金成功！");
@@ -362,7 +364,11 @@
                throw new Exception("修改用户资金出错，抛出异常");
            }
            userWithdraw.setWithMsg(authMsg);
        }else{
            userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
            userAssetsMapper.updateById(userAssets);
        }

        userWithdraw.setWithStatus(state);
        userWithdraw.setTransTime(new Date());
        int updateCount = this.userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);