From e0256316b31ded9be3bc0f978391dc9aaee21a45 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 04 Sep 2024 17:28:14 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 8 +++-----
src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java | 5 +++++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java b/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java
index 567c498..3f8c738 100644
--- a/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java
+++ b/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);
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index f62dfe2..9344aa9 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/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);
--
Gitblit v1.9.3