From eb357bb9938d569734b04948695726b80c5dfb85 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Wed, 19 Nov 2025 10:40:27 +0800
Subject: [PATCH] 代理后台新增删除用户、提现审核

---
 src/main/java/com/nq/service/impl/PriceServicesImpl.java |   61 +++++++++++++++++++++---------
 1 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/PriceServicesImpl.java b/src/main/java/com/nq/service/impl/PriceServicesImpl.java
index 4273c99..5e44668 100644
--- a/src/main/java/com/nq/service/impl/PriceServicesImpl.java
+++ b/src/main/java/com/nq/service/impl/PriceServicesImpl.java
@@ -9,6 +9,7 @@
 import com.nq.dao.StockDzMapper;
 import com.nq.dao.StockMapper;
 import com.nq.dao.StockSettingMapper;
+import com.nq.dao.StockTimeSettingMapper;
 import com.nq.enums.EConfigKey;
 import com.nq.enums.EStockType;
 import com.nq.pojo.*;
@@ -29,6 +30,7 @@
 import  java.io.InputStreamReader;
 import  java.net.HttpURLConnection;
 import  java.net.URL;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -52,39 +54,60 @@
     @Resource
     StockDzMapper stockDZMapper;
 
+    @Resource
+    StockTimeSettingMapper stockTimeSettingMapper;
+
     @Override
     public BigDecimal getNowPrice(String stockCode) {
         Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code",stockCode));
         if(null == stock){
             return BigDecimal.ZERO;
         }
-        StockSetting stockSetting = stockSettingMapper.selectOne(new QueryWrapper<StockSetting>().eq("stock_code",stockCode));
-        if(stockSetting != null){
-            Date newDate = new Date();
-            DateTime startTime = DateUtil.parseDateTime(stockSetting.getStartTime());
-            DateTime endTime = DateUtil.parseDateTime(stockSetting.getEndTime());
-            if(newDate.after(startTime) && newDate.before(endTime)){
-//            if(TimeUtil.isTradingHour(stockSetting.getStartTime(),stockSetting.getEndTime())){
-                if(stockSetting.getType().equals("0")){
-                    return  new BigDecimal(stockSetting.getPrice());
-                }else{
-                    String s = doPost(stock.getStockCode());
-                    if(null != s){
-                        Map<String, Object> stringObjectMap = jsonToMap(s);
-                        return   new BigDecimal(stringObjectMap.get("Last").toString()).multiply(new BigDecimal(stockSetting.getPrice()));
-                    }
-                }
-            }
-        }
+//        StockSetting stockSetting = stockSettingMapper.selectOne(new QueryWrapper<StockSetting>().eq("stock_code",stockCode));
+//        if(stockSetting != null){
+//            Date newDate = new Date();
+//            DateTime startTime = DateUtil.parseDateTime(stockSetting.getStartTime());
+//            DateTime endTime = DateUtil.parseDateTime(stockSetting.getEndTime());
+//            if(newDate.after(startTime) && newDate.before(endTime)){
+////            if(TimeUtil.isTradingHour(stockSetting.getStartTime(),stockSetting.getEndTime())){
+//                if(stockSetting.getType().equals("0")){
+//                    return  new BigDecimal(stockSetting.getPrice());
+//                }else{
+//                    String s = doPost(stock.getStockCode());
+//                    if(null != s){
+//                        Map<String, Object> stringObjectMap = jsonToMap(s);
+//                        return   new BigDecimal(stringObjectMap.get("Last").toString()).multiply(new BigDecimal(stockSetting.getPrice()));
+//                    }
+//                }
+//            }
+//        }
 
         String s = doPost(stock.getStockCode());
         if(null != s) {
             Map<String, Object> stringObjectMap = jsonToMap(s);
-            return  new BigDecimal(stringObjectMap.get("Last").toString());
+            Boolean b = timeCheck();
+            if(b){
+                return  new BigDecimal(stringObjectMap.get("Last").toString());
+            }else{
+                return  new BigDecimal(stringObjectMap.get("PrevClose").toString());
+            }
+
         }
         return BigDecimal.ZERO;
     }
 
+    public  Boolean timeCheck() {
+        StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type","US"));
+
+        if(stockTimeSetting == null){
+            return  false;
+        }
+        if(!stockTimeSetting.getWeekDay().contains(String.valueOf(LocalDate.now().getDayOfWeek().getValue()))){
+            return false;
+        }
+        return TimeUtil.isTradingHour(stockTimeSetting.getAmStartTime(),stockTimeSetting.getAmEndTime(),stockTimeSetting.getPmStartTime(),stockTimeSetting.getPmEndTime());
+    }
+
     @Override
     public Map<String, Object> getNewStock(String stockCode) {
         Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code",stockCode));

--
Gitblit v1.9.3