mitao
2025-11-05 aff908fac4b654fd5bffa7b8031b3ff1eb4bf01f
Merge remote-tracking branch 'origin/2.0' into 2.0
3个文件已修改
23 ■■■■■ 已修改文件
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html
@@ -37,8 +37,8 @@
                <div class="form-group">
                    <label class="col-sm-3 control-label">*预约场地类型:</label>
                    <div class="col-sm-4">
                        <input type="radio" name="type" value="1" ${item.isHalf ==1 ? '' :'checked'} onclick="updateType(1)"   disabled> 全场
                        <input type="radio" name="type" value="2" ${item.isHalf ==2 ? '' :'checked'} onclick="updateType(2)"  disabled> 半场
                        <input type="radio" name="type9"  ${item.isHalf ==2 ? "checked" :""}    disabled> 全场
                        <input type="radio" name="type9"  ${item.isHalf ==1 ? "checked" :""}   disabled> 半场
                    </div>
                </div>
                <div class="form-group">
cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
@@ -79,7 +79,7 @@
                </div>
            </div>
            <#avatar id="cover" name="*门票封面(推荐像素350x350px)" />
            <#avatar id="cover" name="*门票封面(推荐像素350x350px)" avatarImg="" />
            <div class="row" id="app" >
                <div class="col-sm-6" style="width: 100%;margin-left: 7%">
cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java
@@ -61,11 +61,26 @@
            return ResultUtil.success();
        }
        if (codeType==3){
            // 远程调用将门票设置为已使用 然后判断是否能入场
            //  判断是否能入场 远程调用将门票设置为已使用
            LocalDate now = LocalDate.now();
            Date date1 = new Date();
            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
            SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
            String day = simpleDateFormat.format(now);
            String nowDate = simpleDateFormat.format(date1);
            List<QuerySiteTimes> querySiteTimes = siteService.querySiteTimes(rid, day, null, null, 2);
            Integer flag =0;
            for (QuerySiteTimes querySiteTime : querySiteTimes) {
                if (querySiteTime.getSelectable()==1){
                    //
                }
            }
            if (flag==0){
                return ResultUtil.error("该时间段已无空位");
            }else{
                return ResultUtil.success();
            }
        }
        if (codeType==4){
            // 判断能否入场