1

zj

2024-09-04 e0256316b31ded9be3bc0f978391dc9aaee21a45

1

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

@@ -92,7 +92,12 @@
                .eq(UserAssets::getUserId, user.getId())
                .eq(UserAssets::getAccectType, "JP")
        );

        BigDecimal amount = new BigDecimal(buyNum).multiply(targetPrice).setScale(5, RoundingMode.DOWN);
        if (userAssets.getAvailableBalance().compareTo(amount) < 0) {
            return ServerResponse.createByErrorMsg("订单失败，余额不足", request);
        }

        userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
        userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount));
        userAssetsMapper.updateById(userAssets);

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

@@ -190,11 +190,9 @@
        BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(buyNum)).divide(new BigDecimal(lever));
        BigDecimal orderFree = siteSettingBuyFee.multiply(buyAmt);

//        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);
//        }
        if (userAssets.getAvailableBalance().compareTo(buyAmt.add(orderFree)) < 0) {
            return ServerResponse.createByErrorMsg("订单失败，余额不足", request);
        }
        UserPosition userPosition = new UserPosition();
        if (profitTarget != null && profitTarget.compareTo(new BigDecimal("0")) > 0) {
            userPosition.setProfitTargetPrice(profitTarget);