bug修改,后台新增预约记录，玩湃惠民卡修改二维码参数规则，启动游戏取消校验是否订场校验

无关风月

6 天以前 cabda12d788eeb6e056113ac8352dfaf972490d9

bug修改,后台新增预约记录，玩湃惠民卡修改二维码参数规则，启动游戏取消校验是否订场校验

 cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java

@@ -281,6 +281,7 @@
            if (null == uid) {
                return ResultUtil.tokenErr();
            }
            SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            HuiminAgreementVO huiminAgreementVO = new HuiminAgreementVO();
            List<THuiminCard> cardList = huiminCardService.getHuiminAgreementAndList(pageNo, pageSize, storeId);
            List<THuiminCard> list = huiminCardService.list();
@@ -388,18 +389,37 @@
                                Date start = DateUtil.parse(s1, "yyyy-MM-dd HH:mm:ss");
                                Date end = DateUtil.parse(e1, "yyyy-MM-dd HH:mm:ss");
                                if (new Date().after(start) && new Date().before(end)) {
//                                    jsonObject2.put("start_time", start.getTime() / 1000);
//                                    
                                    Date date1 = new Date();
                                    jsonObject2.put("start_time", date1.getTime() / 1000);
                                    jsonObject2.put("start_time", simpleDateFormat1.format( date1));
                                    date1.setTime(date1.getTime() + 30 * 1000);
                                    if (start.before(end)) {
                                        jsonObject2.put("end_time", date1.getTime() / 1000);
                                        jsonObject2.put("end_time", simpleDateFormat1.format( date1));
                                        jsonArray.add(jsonObject2);
                                    }
                                }
                            }else{
                                // 返回过期的二维码 保证开门失败即可
                                JSONObject jsonObject3 = new JSONObject();
                                Date date1 = new Date();
                                date1.setTime(date1.getTime() - 300 * 1000);
                                jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                                jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                                jsonArray.add(jsonObject3);
                            }
                        }
                    }
                }
                else{
                    // 返回过期的二维码 保证开门失败即可
                    JSONObject jsonObject3 = new JSONObject();
                    Date date1 = new Date();
                    date1.setTime(date1.getTime() - 300 * 1000);
                    jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                    jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                    jsonArray.add(jsonObject3);
                }
                if (!jsonArray.isEmpty()) {
                    huiminCardVO1.setEndTime(simpleDateFormat.format(payHuimin.getEndTime()));
@@ -483,6 +503,7 @@
            if (null == uid) {
                return ResultUtil.tokenErr();
            }
            SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            List<TPayHuimin> payHuimins = payHuiminService.list(new LambdaQueryWrapper<TPayHuimin>()
                    .eq(TPayHuimin::getAppUserId, uid)
                    .eq(TPayHuimin::getCardId, id)
@@ -538,18 +559,36 @@
                                    Date start = DateUtil.parse(s1, "yyyy-MM-dd HH:mm:ss");
                                    Date end = DateUtil.parse(e1, "yyyy-MM-dd HH:mm:ss");
                                    if (new Date().after(start) && new Date().before(end)) {
//                                    jsonObject2.put("start_time", start.getTime() / 1000);
//                                    
                                        Date date1 = new Date();
                                        jsonObject2.put("start_time", date1.getTime() / 1000);
                                        jsonObject2.put("start_time", simpleDateFormat1.format( date1));
                                        date1.setTime(date1.getTime() + 30 * 1000);
                                        if (start.before(end)) {
                                            jsonObject2.put("end_time", date1.getTime() / 1000);
                                            jsonObject2.put("end_time", simpleDateFormat1.format( date1));
                                            jsonArray.add(jsonObject2);
                                        }
                                    }
                                }else{
                                    // 返回过期的二维码 保证开门失败即可
                                    JSONObject jsonObject3 = new JSONObject();
                                    Date date1 = new Date();
                                    date1.setTime(date1.getTime() - 300 * 1000);
                                    jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                                    jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                                    jsonArray.add(jsonObject3);
                                }
                            }
                        }
                    }else{
                        // 返回过期的二维码 保证开门失败即可
                        JSONObject jsonObject = new JSONObject();
                        Date date1 = new Date();
                        date1.setTime(date1.getTime() - 300 * 1000);
                        jsonObject.put("end_time", simpleDateFormat1.format( date1));
                        jsonObject.put("start_time", simpleDateFormat1.format( date1));

                        jsonArray.add(jsonObject);
                    }
                    if (!jsonArray.isEmpty()) {
                        // 将学员加入
@@ -585,6 +624,7 @@
            if (null == uid) {
                return ResultUtil.tokenErr();
            }
            SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            List<TStudent> tStudents = studentClient.queryStudentList(uid);

            List<TPayHuimin> payHuimins = payHuiminService.list(new LambdaQueryWrapper<TPayHuimin>()
@@ -646,21 +686,39 @@
                                // 转化为Date类型
                                Date start = DateUtil.parse(s1, "yyyy-MM-dd HH:mm:ss");
                                Date end = DateUtil.parse(e1, "yyyy-MM-dd HH:mm:ss");
                                jsonObject2.put("start_time", start.getTime() / 1000);
                                
                                start.setTime(start.getTime() + 30 * 1000);
                                if (new Date().after(start) && new Date().before(end)) {
//                                    jsonObject2.put("start_time", start.getTime() / 1000);
//                                    
                                    Date date1 = new Date();
                                    jsonObject2.put("start_time", date1.getTime() / 1000);
                                    jsonObject2.put("start_time", simpleDateFormat1.format( date1));
                                    date1.setTime(date1.getTime() + 30 * 1000);
                                    if (start.before(end)) {
                                        jsonObject2.put("end_time", date1.getTime() / 1000);
                                        jsonObject2.put("end_time", simpleDateFormat1.format( date1));
                                        jsonArray.add(jsonObject2);
                                    }
                                }
                            }else{
                                // 返回过期的二维码 保证开门失败即可
                                JSONObject jsonObject3 = new JSONObject();
                                Date date1 = new Date();
                                date1.setTime(date1.getTime() - 300 * 1000);
                                jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                                jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                                jsonArray.add(jsonObject3);
                            }
                        }
                    }
                }else{
                    // 返回过期的二维码 保证开门失败即可
                    JSONObject jsonObject = new JSONObject();
                    Date date1 = new Date();
                    date1.setTime(date1.getTime() - 300 * 1000);
                    jsonObject.put("end_time", simpleDateFormat1.format( date1));
                    jsonObject.put("start_time", simpleDateFormat1.format( date1));

                    jsonArray.add(jsonObject);
                }
                TStudent tStudent = tStudents.stream().filter(e -> e.getId().equals(studentId)).findFirst().orElse(null);
                if (tStudent!=null){
@@ -842,6 +900,7 @@
            if (tPayHuimin == null) {
                return ResultUtil.error("玩湃惠民卡不存在");
            }
            SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            THuiminCard byId = huiminCardService.getById(tPayHuimin.getCardId());
            MyHuiminCardDetailVO myHuiminCardDetailVO = new MyHuiminCardDetailVO();
            List<TStudent> studentByIds1 = studentClient.getStudentByIds(tPayHuimin.getStudentId());
@@ -892,21 +951,39 @@
                            // 转化为Date类型
                            Date start = DateUtil.parse(s1, "yyyy-MM-dd HH:mm:ss");
                            Date end = DateUtil.parse(e1, "yyyy-MM-dd HH:mm:ss");
                            jsonObject2.put("start_time", start.getTime() / 1000);
                            
                            start.setTime(start.getTime() + 30 * 1000);
                            if (new Date().after(start) && new Date().before(end)) {
//                                    jsonObject2.put("start_time", start.getTime() / 1000);
//                                    
                                Date date1 = new Date();
                                jsonObject2.put("start_time", date1.getTime() / 1000);
                                jsonObject2.put("start_time", simpleDateFormat1.format( date1));
                                date1.setTime(date1.getTime() + 30 * 1000);
                                if (start.before(end)) {
                                    jsonObject2.put("end_time", date1.getTime() / 1000);
                                    jsonObject2.put("end_time", simpleDateFormat1.format( date1));
                                    jsonArray.add(jsonObject2);
                                }
                            }
                        }else{
                            // 返回过期的二维码 保证开门失败即可
                            JSONObject jsonObject3 = new JSONObject();
                            Date date1 = new Date();
                            date1.setTime(date1.getTime() - 300 * 1000);
                            jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                            jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                            jsonArray.add(jsonObject3);
                        }
                    }
                }
            }else{
                // 返回过期的二维码 保证开门失败即可
                JSONObject jsonObject = new JSONObject();
                Date date1 = new Date();
                date1.setTime(date1.getTime() - 300 * 1000);
                jsonObject.put("end_time", simpleDateFormat1.format( date1));
                jsonObject.put("start_time", simpleDateFormat1.format( date1));

                jsonArray.add(jsonObject);
            }

            String temp = "{\"id\":"+tPayHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tPayHuimin.getStudentId().split(",")[0] + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";

 cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js

@@ -112,6 +112,9 @@
        if(data!=null){
            let htmlStr = '';
            if (data.length>0){
                if (data.length==0){
                    return
                }
            for (let i = 0; i < data.length; i++) {
                htmlStr += '<option value="' + data[i] + '">' + data[i] + '</option>'
            }

 cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java

@@ -110,15 +110,15 @@
            Integer uid = tokenUtil.getUserIdFormRedis();
            AppUser appUser = appUserClient.queryAppUser(uid);
            List<TGameConfig> tGameConfigs = new ArrayList<>();
            if (appUser.getAddUserId() == null) {
                List<SiteLock> lock = lockService.list(new QueryWrapper<SiteLock>().eq("siteId", siteId));
                Date now = new Date();
                for (SiteLock siteLock : lock) {
                    if (now.after(siteLock.getStartTime()) && now.before(siteLock.getEndTime())) {
                        return ResultUtil.error("当前场地已被锁定");
                    }
                }
            }
//            if (appUser.getAddUserId() == null) {
//                List<SiteLock> lock = lockService.list(new QueryWrapper<SiteLock>().eq("siteId", siteId));
//                Date now = new Date();
//                for (SiteLock siteLock : lock) {
//                    if (now.after(siteLock.getStartTime()) && now.before(siteLock.getEndTime())) {
//                        return ResultUtil.error("当前场地已被锁定");
//                    }
//                }
//            }
            List<TGame> list = gameService.list(new LambdaQueryWrapper<TGame>().eq(TGame::getSiteId, siteId).eq(TGame::getStoreId, storeId).eq(TGame::getState, 0));
            if (list.size() > 0) {
                Integer id = list.get(0).getId();