1

dd

2026-01-16 e6a7d151f42b24dfcf42ac8ccb6f10e0d8717ec6

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

@@ -2112,17 +2112,20 @@
        }
        StockDz stockDz = null;
        stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("stock_code", stockCode));
        String am_begin = siteSetting.getTransAmBeginhk();
        String am_end = siteSetting.getTransAmEndhk();
        String pm_begin = siteSetting.getTransPmBeginhk();
        String pm_end = siteSetting.getTransPmEndhk();
        boolean am_flag = BuyAndSellUtils.isTransTime(am_begin, am_end);
        boolean pm_flag = BuyAndSellUtils.isTransTime(pm_begin, pm_end);
        log.info("是否在大宗交易时间 = {}", Boolean.valueOf(pm_flag));
//        String am_begin = siteSetting.getTransAmBeginhk();
//        String am_end = siteSetting.getTransAmEndhk();
//        String pm_begin = siteSetting.getTransPmBeginhk();
//        String pm_end = siteSetting.getTransPmEndhk();
//        boolean am_flag = BuyAndSellUtils.isTransTime(am_begin, am_end);
//        boolean pm_flag = BuyAndSellUtils.isTransTime(pm_begin, pm_end);
//        log.info("是否在大宗交易时间 = {}", Boolean.valueOf(pm_flag));
        //15-15:30
//        if (!pm_flag) {
//            return ServerResponse.createByErrorMsg("下单失败，不在交易时段内");
//        }
        if(stockDz.getStartTime().getTime() > new Date().getTime() || stockDz.getEndTime().getTime() < new Date().getTime()){
            return ServerResponse.createByErrorMsg("不在交易时间之内");
        }
        if (siteProduct.getHolidayDisplay()) {
            return ServerResponse.createByErrorMsg("周末或节假日不能交易！");
        }
@@ -2425,17 +2428,19 @@
        }
        StockVip stockVip = null;
        stockVip = this.stockVipMapper.selectOne(new QueryWrapper<StockVip>().eq("stock_code", stockCode));
        String am_begin = siteSetting.getTransAmBeginhk();
        String am_end = siteSetting.getTransAmEndhk();
        String pm_begin = siteSetting.getTransPmBeginhk();
        String pm_end = siteSetting.getTransPmEndhk();
        boolean am_flag = BuyAndSellUtils.isTransTime(am_begin, am_end);
        boolean pm_flag = BuyAndSellUtils.isTransTime(pm_begin, pm_end);
        log.info("是否在VIP交易时间 = {}", Boolean.valueOf(pm_flag));
        //15-15:30
//        String am_begin = siteSetting.getTransAmBeginhk();
//        String am_end = siteSetting.getTransAmEndhk();
//        String pm_begin = siteSetting.getTransPmBeginhk();
//        String pm_end = siteSetting.getTransPmEndhk();
//        boolean am_flag = BuyAndSellUtils.isTransTime(am_begin, am_end);
//        boolean pm_flag = BuyAndSellUtils.isTransTime(pm_begin, pm_end);
//        log.info("是否在VIP交易时间 = {}", Boolean.valueOf(pm_flag));
//        if (!pm_flag) {
//            return ServerResponse.createByErrorMsg("下单失败，不在交易时段内");
//        }
        if(stockVip.getStartTime().getTime() > new Date().getTime() || stockVip.getEndTime().getTime() < new Date().getTime()){
            return ServerResponse.createByErrorMsg("不在交易时间之内");
        }
        if (siteProduct.getHolidayDisplay()) {
            return ServerResponse.createByErrorMsg("周末或节假日不能交易！");
        }