Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-10-24 0379c65f03ec6ccf27eebbdc72a25cabbda28e5a

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java

@@ -182,7 +182,6 @@
    @ResponseBody
    public List<Game> changelist(BallQueryDto ballQueryDto) {
System.out.println("=======ballQueryDto=========="+ballQueryDto);

        return ballClient.list(ballQueryDto);
    }

@@ -375,7 +374,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 +410,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 +450,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 +474,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);
@@ -516,8 +560,6 @@


        List<OrderDto> timeRanges = new ArrayList<>();


        Site site =  siteClient.listById(book.getSiteId());
        System.out.println("================"+site);
        String appointmentStartTime = site.getAppointmentStartTime();
@@ -556,9 +598,6 @@
            if (strings1.contains(timeRange)){
                orderDto.setState(1);
            }




            timeRanges.add(orderDto);
            currentTime = nextTime;
@@ -822,9 +861,10 @@

    @RequestMapping("/addjs")
    @ResponseBody
    public void addjs( @RequestBody JsDto jsDto) {
    public ResultUtil addjs( @RequestBody JsDto jsDto) {
        System.out.println("=======jsDto========"+jsDto);
        storeService.insert(jsDto);
        return new ResultUtil(0,0,"保存成功",null,null);

    }