From aaad873de7e0e0eaedc1fa86f2e6160462ec692a Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 20 Nov 2025 14:36:04 +0800
Subject: [PATCH] 大宗开市时间
---
trading-order-service/src/main/java/com/yami/trading/service/MarketOpenChecker.java | 24 ++++++++++++++++++++++--
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 17 ++++++++++++++---
2 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/MarketOpenChecker.java b/trading-order-service/src/main/java/com/yami/trading/service/MarketOpenChecker.java
index cd6e9d9..42147a1 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/MarketOpenChecker.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/MarketOpenChecker.java
@@ -211,8 +211,8 @@
}
case US_STOCKS: {
ZonedDateTime nowNewYork = nowUtc.withZoneSameInstant(ZoneId.of("America/New_York"));
- String formattedDate = nowNewYork.format(formatter);
- /*if (usStockStopSet.contains(formattedDate)) {
+ /*String formattedDate = nowNewYork.format(formatter);
+ if (usStockStopSet.contains(formattedDate)) {
return false;
}*/
if (!isUsSupportPreAndAfter()) {
@@ -411,6 +411,26 @@
return false;
}
+ public static boolean isMarketOpenBuyDz(String market) {
+ ZonedDateTime nowUtc = ZonedDateTime.now(ZoneId.of("UTC"));
+ return isOpenBuyDz(market, nowUtc);
+ }
+
+ private static boolean isOpenBuyDz(String market, ZonedDateTime nowUtc) {
+ switch (market) {
+ case US_STOCKS: {
+ ZonedDateTime nowNewYork = nowUtc.withZoneSameInstant(ZoneId.of("America/New_York"));
+ if (nowNewYork.getDayOfWeek().getValue() < 6) {
+ return true;
+ }
+ break;
+ }
+ default:
+ throw new IllegalArgumentException("无效的市场名称");
+ }
+ return false;
+ }
+
public static List<OpenCloseTime> listUsOpenCloseDateTime() {
int year = 2023;
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
index 9d42b27..98d906f 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
@@ -27,6 +27,7 @@
import com.yami.trading.common.util.RandomUtil;
import com.yami.trading.dao.dz.ExchangeApplyOrderDzMapper;
import com.yami.trading.dao.dz.StockDzMapper;
+import com.yami.trading.service.MarketOpenChecker;
import com.yami.trading.service.MoneyLogService;
import com.yami.trading.service.WalletService;
import com.yami.trading.service.data.DataService;
@@ -264,7 +265,7 @@
}
if(stockDz.getStartTime().getTime() > new Date().getTime() || stockDz.getEndTime().getTime() < new Date().getTime()){
- throw new YamiShopBindException("不在内幕交易时间之内");
+ return Result.failed("不在内幕交易时间之内");
}
BigDecimal nowPrice = stockDz.getNowPrice();
@@ -272,8 +273,13 @@
throw new YamiShopBindException("股票价格0,请重试");
}
if (stockDz.getStockNum() > num) {
- throw new YamiShopBindException("请购买最小数量");
+ return Result.failed("请购买最小数量");
}
+ boolean isOpen = MarketOpenChecker.isMarketOpenBuyDz(Item.US_STOCKS);
+ if (!isOpen) {
+ return Result.failed("当前股市休市");
+ }
+
Wallet wallet = this.walletService.saveWalletByPartyId(partyId);
BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(num));
@@ -486,10 +492,15 @@
Date resultTime = calendar.getTime();
if(now.getTime() < resultTime.getTime()){
- throw new YamiShopBindException("未到平仓时间");
+ return Result.failed("未到平仓时间");
}
}
+ boolean isOpen = MarketOpenChecker.isMarketOpenByItemCloseType(Item.US_STOCKS);
+ if (!isOpen) {
+ return Result.failed("当前股市休市");
+ }
+
Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
BigDecimal sellAmt = nowPrice.multiply(new BigDecimal(num));
//手续费比率
--
Gitblit v1.9.3