1

zj

2025-11-04 b6c17624a50c6fe44049e63a1854822838a1675a

 src/main/java/com/nq/service/impl/PriceServicesImpl.java

@@ -63,24 +63,24 @@
        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) {