44323
2023-10-24 fc41b97c07249254845bf2c598763f25eb2592f7
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -182,7 +182,9 @@
    @ResponseBody
    public List<Game> changelist(BallQueryDto ballQueryDto) {
System.out.println("=======ballQueryDto=========="+ballQueryDto);
        User user = UserExt.getUser();
        ballQueryDto.setType(user.getObjectType());
        ballQueryDto.setId(user.getObjectId());
        return ballClient.list(ballQueryDto);
    }
@@ -375,7 +377,27 @@
    @RequestMapping("/pre_add")
    public String add(Model model) {
        Integer objectType = UserExt.getUser().getObjectType();
        if (objectType ==3){
            model.addAttribute("is3","true");
            model.addAttribute("storeId",UserExt.getUser().getObjectId());
            TStore byId = storeService.getById(UserExt.getUser().getObjectId());
            model.addAttribute("cityCode",byId.getCityCode());
            model.addAttribute("provinceCode",byId.getProvinceCode());
            model.addAttribute("oId",byId.getOperatorId());
            return PREFIX+"ball_pre_add1.html";
        }else {
            model.addAttribute("is3","false");
        }
        model.addAttribute("is","${is}");
        return PREFIX+"ball_pre_add.html";
    }
@@ -391,6 +413,12 @@
    System.out.println("---------game------"+game);
        model.addAttribute("game",game);
        if (game.getOperationId() ==0){
            model.addAttribute("opId","平台");
            model.addAttribute("is","平台");
        }else {
            model.addAttribute("opId",game.getOperationId());
        }
        TGameConfig kc = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 14));
        model.addAttribute("kc",kc);
@@ -425,6 +453,18 @@
        model.addAttribute("ly",ly);
        Integer objectType = UserExt.getUser().getObjectType();
        if (objectType ==3){
            model.addAttribute("is3","true");
            model.addAttribute("storeId",UserExt.getUser().getObjectId());
            TStore byId = storeService.getById(UserExt.getUser().getObjectId());
            model.addAttribute("cityCode",byId.getCityCode());
            model.addAttribute("provinceCode",byId.getProvinceCode());
            model.addAttribute("oId",byId.getOperatorId());
            return PREFIX+"ball_pre_edit1.html";
        }
        return PREFIX+"ball_pre_edit.html";
    }
@@ -437,6 +477,13 @@
        System.out.println("---------game------"+game);
        model.addAttribute("game",game);
        if (game.getOperationId() ==0){
            model.addAttribute("opId","平台");
            model.addAttribute("is","平台");
        }else {
            model.addAttribute("opId",game.getOperationId());
        }
        TGameConfig kc = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 14));
        model.addAttribute("kc",kc);
@@ -898,9 +945,9 @@
            LocalTime targetTime = LocalTime.parse(currentTime);
            boolean hasExceeded = currentTime1.isAfter(targetTime);
//    if (hasExceeded){
//        orderDto.setState(0);
//    }
    if (hasExceeded){
        orderDto.setState(0);
    }
    if (strings.contains(timeRange)){
        orderDto.setState(0);
    }