From 8705f831e1fd8886fd7be3391025798299c93866 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 05 Aug 2024 18:31:16 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserPositionServiceImpl.java |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 607a4f6..6dd23f5 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -1738,10 +1738,14 @@
         BigDecimal pcp = new BigDecimal(stockRealTimeBean.getPcp());
         //涨停板配置
         //组装需要查询的key
-        String[] keysArray = new String[]{"limit_up_point","limit_up_is_buy"};
+        String[] keysArray = new String[]{EConfigKey.LIMIT_UP_INTERVAL.getCode(),EConfigKey.LIMIT_UP_IS_BUY.getCode()};
         List<String> keysList = Arrays.asList(keysArray);
         Map<String, StockConfig> stockConfigs = stockConfigServices.queryByKeys(keysList);
-        if(null != stockConfigs && "1".equals(stockConfigs.get("limit_up_is_buy").getCValue()) && pcp.compareTo(new BigDecimal(stockConfigs.get("limit_up_is_buy").getCValue())) >= 0){
+        if(null != stockConfigs && "1".equals(stockConfigs.get(EConfigKey.LIMIT_UP_IS_BUY.getCode()).getCValue())){
+            //判断区间
+            if(!isInAnyInterval(pcp, stockConfigs.get(EConfigKey.LIMIT_UP_INTERVAL.getCode()).getCValue())){
+                return 0;
+            }
             //插入购买申请
             UserPurchaseApplication purchaseApplication = new UserPurchaseApplication();
             purchaseApplication.setStockCode(stock.getStockCode());
@@ -1770,6 +1774,30 @@
         return 0;
     }
 
+    public boolean isInAnyInterval(BigDecimal pcp, String intervals) {
+        if(intervals.indexOf(",")>0){
+            String[] intervalArray = intervals.split(",");
+            for (String interval : intervalArray) {
+                if (isInSingleInterval(pcp, interval.trim())) {
+                    return true;
+                }
+            }
+        }else {
+            if (isInSingleInterval(pcp, intervals.trim())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean isInSingleInterval(BigDecimal pcp, String interval) {
+        String[] parts = interval.split("-");
+        BigDecimal start = new BigDecimal(parts[0].trim());
+        BigDecimal end = new BigDecimal(parts[1].trim());
+
+        return pcp.compareTo(start) >= 0 && pcp.compareTo(end) <= 0;
+    }
+
     private Result getResult(UserPosition position) {
         // 检查订单是否存在
         if (position == null) {

--
Gitblit v1.9.3