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/UserStockSubscribeServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index f8f8740..69fd170 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -11,6 +11,7 @@
 import com.nq.dao.*;
 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.UserFundUtil;
@@ -109,7 +110,7 @@
                     return ServerResponse.createByErrorMsg("下单失败,请先实名认证");
                 }
 //                判断休息日不能买入
-                if (siteProduct.getHolidayDisplay()) {
+                if (TradingDayUtil.shouldBlockTradingToday(siteProduct)) {
                     return ServerResponse.createByErrorMsg("周末或节假日不能交易!");
                 }
                 //重复申购限制
@@ -598,7 +599,7 @@
         SiteProduct siteProduct = iSiteProductService.getProductSetting();
 
 //                判斷休息日不能買入
-        if (siteProduct.getHolidayDisplay()) {
+        if (TradingDayUtil.shouldBlockTradingToday(siteProduct)) {
             return ServerResponse.createByErrorMsg("周末或節假日不能交易!");
         }
         //重復申購限製
@@ -802,7 +803,7 @@
                 userPosition.setOrderStayDays(1);
 
 
-                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);
 

--
Gitblit v1.9.3