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

44323

2023-10-25 e16180612c9dfe2e879f79039d4670640867331d

 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);
    }

@@ -218,8 +220,24 @@
        game.setRed(red);
        game.setState(0);
        game.setBlue(blue);


        Integer objectType = UserExt.getUser().getObjectType();

        if (objectType ==3){


            TStore byId = storeService.getById(UserExt.getUser().getObjectId());
            System.out.println("=====byId======="+byId);
            game.setProvinceCode(byId.getProvinceCode());
            game.setCityCode(byId.getCityCode());


        }else {
        game.setProvinceCode(province);
        game.setCityCode(city);

        }
        game.setSiteId(site);
        game.setStoreId(store);
        game.setId(id);
@@ -375,7 +393,32 @@
    @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());
            System.out.println("=====byId======="+byId);
            model.addAttribute("cityCode",byId.getCityCode());
            model.addAttribute("provinceCode",byId.getProvinceCode());
            model.addAttribute("oId",byId.getOperatorId());
            return PREFIX+"ball_pre_add1.html";

        }

        if (objectType == 2){
            model.addAttribute("is3","true");
            model.addAttribute("oId",UserExt.getUser().getObjectId());
            return PREFIX+"ball_pre_add2.html";
        }



        model.addAttribute("is","${is}");



        return PREFIX+"ball_pre_add.html";
    }
@@ -391,6 +434,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 +474,22 @@
        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";

        }
        if (objectType == 2){
            return PREFIX+"ball_pre_edit2.html";

        }

        return PREFIX+"ball_pre_edit.html";
    }
@@ -437,6 +502,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 +588,6 @@


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


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




            timeRanges.add(orderDto);
            currentTime = nextTime;
@@ -813,6 +880,10 @@
    @RequestMapping("/yuyuelist")
    @ResponseBody
    public List<Map<String,Object>> yuyuelist(BookingQuery bookingQuery) {
        Integer objectType = UserExt.getUser().getObjectType();
        if(objectType==3){
            bookingQuery.setStoreId(UserExt.getUser().getObjectId());
        }
        List<Map<String,Object>> orders =   ballClient.listorder(bookingQuery);
        System.out.println("=======ballQueryDto=========="+bookingQuery);

@@ -822,9 +893,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);

    }