From d615fc515fc52d6ed970c11d59a017e48de4be32 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 16 Jun 2026 16:43:58 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserFundsPositionServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserFundsPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserFundsPositionServiceImpl.java
index 1c6c174..56355b4 100644
--- a/src/main/java/com/nq/service/impl/UserFundsPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserFundsPositionServiceImpl.java
@@ -9,6 +9,7 @@
import com.nq.dao.UserMapper;
import com.nq.pojo.*;
import com.nq.service.*;
+import com.nq.utils.TradingDayUtil;
import com.nq.utils.DateTimeUtil;
import com.nq.utils.KeyUtils;
import com.nq.utils.stock.BuyAndSellUtils;
@@ -135,7 +136,7 @@
if (siteProduct.getRealNameDisplay() && (StringUtils.isBlank(user.getRealName()) || StringUtils.isBlank(user.getIdCard()))) {
return ServerResponse.createByErrorMsg("下单失败，请先实名认证");
}
- if(siteProduct.getHolidayDisplay()){
+ if(TradingDayUtil.shouldBlockTradingToday(siteProduct)){
return ServerResponse.createByErrorMsg("周末或节假日不能交易！");
}
BigDecimal user_enable_amt = user.getEnableAmt();
@@ -341,7 +342,7 @@
userPosition.setIsLock(Integer.valueOf(0));
userPosition.setOrderLever(lever);
userPosition.setOrderTotalPrice(buy_amt);
- BigDecimal buy_fee_amt = com.nq.utils.TradeFeeUtil.calcBuyFee(buy_amt);
+ BigDecimal buy_fee_amt = com.nq.utils.TradeFeeUtil.calcBuyFee(buy_amt, siteSetting.getBuyFee());
log.info("用户购买手续费（配资后总资金 * 百分比） = {}", buy_fee_amt);
userPosition.setOrderFee(buy_fee_amt);
@@ -429,7 +430,7 @@
if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
return ServerResponse.createByErrorMsg("平仓失败，用户已被锁定");
}
- if(siteProduct.getHolidayDisplay()){
+ if(TradingDayUtil.shouldBlockTradingToday(siteProduct)){
return ServerResponse.createByErrorMsg("周末或节假日不能交易！");
}
--
Gitblit v1.9.3