1

zj

2024-04-26 92310aaa56ae040c9147f6495630f2c1ae41fac2

1

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

@@ -178,7 +178,7 @@
        BigDecimal   fundratio = new BigDecimal(user.getFundRatio()).divide(new BigDecimal(100));
        BigDecimal availableBalance =  fundratio.multiply(userAssets.getAvailableBalance());
        if (availableBalance.compareTo(buyAmt.add(orderFree)) < 0) {
            return ServerResponse.createByErrorMsg("订单失败，余额不足", request);
            return ServerResponse.createByErrorMsg("订单失败，配资不足", request);
        }
        UserPosition userPosition = new UserPosition();
        if (profitTarget != null && profitTarget.compareTo(new BigDecimal("0")) > 0) {
@@ -1546,7 +1546,7 @@
        BigDecimal   fundratio = new BigDecimal(user.getFundRatio()).divide(new BigDecimal(100));
        BigDecimal availableBalance =  fundratio.multiply(userAssets.getAvailableBalance());
        if (buyAmt.compareTo(availableBalance) > 0) {
            return ServerResponse.createByErrorMsg("订单失败，余额不足", request);
            return ServerResponse.createByErrorMsg("订单失败，配资不足", request);
        }
        UserPosition userPosition = new UserPosition();
        userPosition.setPositionType(3);

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

@@ -88,6 +88,8 @@
    @Autowired
    IStockConfigServices iStockConfigServices;

    @Autowired
    UserAssetsMapper userAssetsMapper;

    @Transactional
    public ServerResponse outMoney(String amt, String with_Pwd,String accsetType,HttpServletRequest request) throws Exception {
@@ -327,7 +329,12 @@
            if (user == null) {
                return ServerResponse.createByErrorMsg("用户不存在");
            }
            int updateCount = this.userMapper.updateById(user);
            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", user.getId());
            if (userAssets == null) {
                return ServerResponse.createByErrorMsg("用户资金账户不存在");
            }
            userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
            int updateCount = userAssetsMapper.updateById(userAssets);
            if (updateCount > 0) {
                log.info("提现失败，返还用户资金成功！");
            } else {