后台bug修改

44323

2023-11-17 2bb111939922d8e48fe11374bfe8ef2834a5bb43

后台bug修改

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

@@ -274,6 +274,7 @@
    @PostMapping("/base/coupon/queryCouponListSearch")
    public List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch){
        List<Map<String, Object>> mapList1 = couponService.queryCouponListOfSearch(ofSearch);

        List<Map<String, Object>> mapList = new ArrayList<>();
        if (ofSearch.getStoreIds()==null){
            ArrayList<Integer> list = new ArrayList<>();
@@ -615,6 +616,7 @@
            if (dataVo.getUserType() == 2){
                coupon.setPublisherType(1);
                coupon.setAuditStatus(1);
                coupon.setCityManagerId(dataVo.getCityManagerId());
            }
            if (dataVo.getUserType() == 3){
                coupon.setPublisherType(3);

 cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java

@@ -28,7 +28,6 @@
                                                      @Param("userPopulation")Integer userPopulation,
                                                      @Param("status")Integer status,
                                                      @Param("state")Integer state,
                                                      @Param("page")Page<Map<String, Object>> page,
                                                      @Param("cityCode") String cityCode,
                                                      @Param("storeId")Integer storeId,
                                                      @Param("operatorId")Integer operatorId,

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java

@@ -119,7 +119,6 @@
                ofSearch.getUserPopulation(),
                ofSearch.getStatus(),
                ofSearch.getState(),
                ofSearch.getPage(),
                ofSearch.getCityCode(),
                ofSearch.getStoreId(),
                ofSearch.getOperatorId(),

 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java

@@ -610,6 +610,16 @@
            wrapper.orderByDesc(Competition::getInsertTime);

            Page<Competition> page = cttService.page(competitionPage, wrapper);
            for (Competition record : page.getRecords()) {

                // 查询当前赛事有多少人报名了
                List<UserCompetition> competitionId = ucttService.list(new QueryWrapper<UserCompetition>()
                        .eq("competitionId", record.getId()));
                // 报名数量
                int temp = competitionId.size();
                String value = String.valueOf(temp);
                record.setCount(record.getApplicantsNumber()+"-"+value);
            }
            return page;
        }catch (Exception e){
            e.printStackTrace();
@@ -655,6 +665,16 @@
    @PostMapping("/base/competition/add")
    public void add(@RequestBody Competition competition){
        try {
            if (competition.getStartTime().after(new Date())){
                competition.setStatus(1);
            }
            if (competition.getStartTime().before(new Date())){
                if (competition.getEndTime().after(new Date())){
                    competition.setStatus(2);
                }else{
                    competition.setStatus(3);
                }
            }
            competition.setInsertTime(new Date());
            cttService.save(competition);
        }catch (Exception e){
@@ -665,6 +685,16 @@
    @PostMapping("/base/competition/update")
    public void update(@RequestBody Competition competition){
        try {
            if (competition.getStartTime().after(new Date())){
                competition.setStatus(1);
            }
            if (competition.getStartTime().before(new Date())){
                if (competition.getEndTime().after(new Date())){
                    competition.setStatus(2);
                }else{
                    competition.setStatus(3);
                }
            }
            cttService.updateById(competition);
        }catch (Exception e){
            e.printStackTrace();

 cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java

@@ -234,7 +234,9 @@
     */
    @TableField("operatorId")
    private Integer operatorId;

    // 已报名人数
    @TableField(exist = false)
    private String count;
    @Override
    protected Serializable pkVal() {
        return this.id;

 cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml

@@ -19,7 +19,7 @@
    <select id="queryCoursePackageSchedulingList" resultType="map">
        SELECT
            CAST(id AS CHAR(20)) AS id,
            CONCAT(DATE_FORMAT(classDate, '%Y-%m-%d %H:%i'), DATE_FORMAT(endDate, '%H:%i')) AS classDate,
            CONCAT(DATE_FORMAT(classDate, '%Y-%m-%d %H:%i'),'-',DATE_FORMAT(endDate, '%H:%i')) AS classDate,
            courseId,
            `status`,
            cancelClasses,

 cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java

@@ -247,8 +247,9 @@
     */
    @TableField("operatorId")
    private Integer operatorId;


    // 已报名人数
    @TableField(exist = false)
    private String count;
    @Override
    protected Serializable pkVal() {
        return this.id;

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

@@ -89,6 +89,13 @@
        for (String s : split) {
            strings.add(s);
        }
        // 现金
        model.addAttribute("m1",list);
        // 玩湃币
        model.addAttribute("m2",list);
        // 课时
        model.addAttribute("m3",list);
        model.addAttribute("state",competition.getAuditStatus());
        model.addAttribute("list",list);
        model.addAttribute("list1",list1);
        model.addAttribute("list2",list2);

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

@@ -245,8 +245,9 @@
        }
        // 运营商可以查看平台添加的优惠券应只展示使用范围为全国通用、
        // 指定城市有运营商管辖的、指定门店有运营商旗下门店
        List<Map<String, Object>> couponListOfSearch = client.getCouponListOfSearch(ofSearch);

        return client.getCouponListOfSearch(ofSearch);
        return couponListOfSearch;
    }

    /**
@@ -381,9 +382,11 @@
        if(UserExt.getUser().getObjectType()==2){
            dataVo.setCompany(3);
            dataVo.setUserType(2);
            dataVo.setCityManagerId(UserExt.getUser().getObjectId());
        }else if(UserExt.getUser().getObjectType()==3){
            dataVo.setStoreIds(UserExt.getUser().getObjectId().toString());
            dataVo.setCompany(3);
            dataVo.setUserType(3);
        }else{
            dataVo.setUserType(1);
        }

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

@@ -135,6 +135,8 @@
    public String detailOfCoupon(@PathVariable Integer id, Model model){
        model.addAttribute("id",id);
        Coupon coupon = client.queryCouponById(id);
        Integer auditStatus1 = coupon.getAuditStatus();
        model.addAttribute("state",auditStatus1);
        String content = coupon.getContent();
        JSONObject jsonObject = JSONObject.parseObject(content);
        String one ="";
@@ -212,6 +214,8 @@
                model.addAttribute("state","未通过");
                break;
        }
        model.addAttribute("cover",coupon.getCover());
        model.addAttribute("productImages",coupon.getProductImages());
        return PREFIX + "TCouponExamineInfo.html";
    }


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

@@ -430,7 +430,7 @@
        if (tCoursePackageDiscounts.size()>0){
            TCoursePackageDiscount tCoursePackageDiscount = tCoursePackageDiscounts.get(0);
            model.addAttribute("audit",tCoursePackageDiscount.getAuditStatus());
            StringBuilder stringBuilder = new StringBuilder("");
            StringBuilder stringBuilder = new StringBuilder(" ");
            // 如果折扣未通过
            if (tCoursePackageDiscount.getAuditStatus() == 3){
                model.addAttribute("state","未通过");

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

@@ -180,6 +180,7 @@
        List<Map<String, Object>> list = new ArrayList<>();
        // 拒绝理由
        StringBuilder reasons = new StringBuilder("");
        int a =0;
        for (CoursePackagePaymentConfig coursePackagePaymentConfig : list4) {
            if(coursePackagePaymentConfig.getCashPayment() == 0){
                continue;
@@ -196,13 +197,25 @@
            }
            map.put("payment",  payment);
            map.put("cashPayment", coursePackagePaymentConfig.getCashPayment());

            List<TCoursePackageDiscount> tCoursePackageDiscounts = coursePackageDiscountClient.queryCoursePackageDiscount(coursePackagePaymentConfig.getId());
            for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
                if (tCoursePackageDiscount.getAuditStatus()==3){
                    reasons.append(tCoursePackageDiscount.getAuditRemark()+",");
                    a = 3;
                    model.addAttribute("type1",3);
                }else{
                    break;
                }else if (tCoursePackageDiscount.getAuditStatus()==2){
                    a=2;
                    model.addAttribute("type1",-1);
                }else{
                    a=1;
                    model.addAttribute("type1",-1);
                    break;
                }
            }
            for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
                if (tCoursePackageDiscount.getAuditStatus()==3){
                    reasons.append(tCoursePackageDiscount.getAuditRemark()+",");
                }
            }
            map.put("coursePackageDiscount", tCoursePackageDiscounts);
@@ -213,7 +226,7 @@
        // 审核状态
        StringBuilder stringBuilder = new StringBuilder("");

        switch (type1){
        switch (a){
            case 1:
                stringBuilder.append("待审核");
                break;

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

@@ -753,7 +753,26 @@
            String convertedValue = s.substring(11);
            strings1.add(convertedValue);
        }

        switch (book.getStatus()){
            case 0:
                model.addAttribute("state","待支付");
                break;
            case 1:
                model.addAttribute("state","待核销");
                break;
            case 2:
                model.addAttribute("state","已到店");
                break;
            case 3:
                model.addAttribute("state","已完成");
                break;
            case 4:
                model.addAttribute("state","已过期");
                break;
            case 5:
                model.addAttribute("state","已取消");
                break;
        }
        System.out.println("========strings1====="+strings1);

//时间段
@@ -823,43 +842,12 @@
        }
        System.out.println("-------------"+timeRanges);
        model.addAttribute("timeRanges",timeRanges);

        System.out.println("======timeRanges========"+timeRanges);






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

        String cityCode = null;


        List<Map<String, Object>> list = storeService.queryProvince(cityCode);
        model.addAttribute("province", list);

        Object code = list.get(0).get("code");
        List<Map<String, Object>> list1 = storeService.queryCity(code.toString(), cityCode);

        model.addAttribute("city", list1);
        String code1 = list1.get(0).get("code").toString();

        List<TStore> list2 = storeService.list(new QueryWrapper<TStore>().eq("cityCode", code1).eq("state", 1));
        model.addAttribute("store", list2);
        TStore store = list2.get(0);
        List<TSite> list3 = siteService.list(new QueryWrapper<TSite>().eq("storeId", store.getId()).eq("state", 1));
        model.addAttribute("site", list3);
        // 查询运营商下所有门店 所有场地
        if (objectType == 2){
            List<TStore> stores = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId));
            model.addAttribute("store", stores);
            // 门店ids
            List<Integer> storeIds = stores.stream().map(TStore::getId).collect(Collectors.toList());
            List<TSite> sites = siteService.list(new QueryWrapper<TSite>().in("storeId", storeIds));
            model.addAttribute("site", sites);
        }
        model.addAttribute("province", book.getProvince());
        model.addAttribute("city", book.getCity());
        model.addAttribute("store",storeService.getById(book.getStoreId()).getName());
        model.addAttribute("siteName",siteService.getById(book.getSiteId()).getName());
        model.addAttribute("objectType", objectType);
        return PREFIX+"yuyue_info.html";
    }

 cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html

@@ -102,18 +102,10 @@


                            <#button name="添加" icon="fa-plus" clickFun="TStudent.openAddTStudent()"/>
                            @if(role == 1){
                            <#button name="修改" icon="fa-edit" clickFun="TStudent.openTStudentDetail()" space="true"/>
                            @}
                            <#button name="确认到店" icon="fa-edit" clickFun="TStudent.openTStudentDetail1()" space="true"/>
                            <#button name="取消预约" icon="fa-edit" clickFun="TStudent.openTStudentDetail4()" space="true"/>
                            <#button name="手动支付" icon="fa-edit" clickFun="TStudent.openTStudentDetail6()" space="true"/>
                            @if(role == 1){
                            <#button name="查看详情" icon="fa-edit" clickFun="TStudent.openTStudentDetail5()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tStudent/delete")){
                                <#button name="删除" icon="fa-remove" clickFun="TStudent.delete()" space="true"/>
                            @}
<!--                            <button id="exportButton">TTTTTTTTTT</button>-->
                        </div>
                        <#table id="TStudentTable"/>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html

@@ -9,65 +9,52 @@
        <input type="hidden" id="id" value="${item.id}">
        <div class="form-horizontal">
            <div class="row">
                <div class="form-group">
                    <label class="col-sm-3 control-label">*当前状态：</label>
                    <h3>&nbsp;&nbsp;&nbsp;${state}</h3>
                </div>
                @if(objectType == 1){
                <div class="form-group">
                    <label class="col-sm-3 control-label">*所在省：</label>
                    <div class="col-sm-4">
                        <select class="form-control" id="provinceCode" name="provinceCode" disabled>
                            @for(obj in province){
                            <option value="${obj.code}" ${obj.code == item.provinceCode ? 'selected=selected' : ''}>${obj.name}</option>
                            @}
                        </select>
                        <input class="form-control" id="province" name="province" type="text" value="${province}" disabled >
                    </div>
                </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label">*所在市：</label>
                    <div class="col-sm-4">
                        <select class="form-control" id="cityCode" name="cityCode" disabled>
                            @for(obj in city){
                            <option value="${obj.code}" ${obj.code == item.cityCode ? 'selected=selected' : ''}>${obj.name}</option>
                            @}
                        </select>
                        <input class="form-control" id="city" name="city" type="text" value="${city}" disabled >
                    </div>
                </div>
                @}
                <div class="form-group">
                    <label class="col-sm-3 control-label">*所属门店：</label>
                    <div class="col-sm-4">
                        <select class="form-control" id="storeId" name="storeId" disabled>
                            @for(obj in store){
                            <option value="${obj.id}" ${obj.id == item.storeId ? 'selected=selected' : ''}>${obj.name}</option>
                            @}
                        </select>
                        <input class="form-control" id="store" name="store" type="text" value="${store}" disabled >
                    </div>
                </div>

                <div class="form-group">
                    <label class="col-sm-3 control-label">*预约类型：</label>
                    <label class="col-sm-3 control-label">*预约场地类型：</label>
                    <div class="col-sm-4">
                        <input type="radio" name="type" value="1"  checked="" onclick="updateType(1)"   disabled> 全场
                        <input type="radio" name="type" value="2" onclick="updateType(2)"  disabled> 半场
                    </div>
                </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label">*预约场地名称：</label>
                    <div class="col-sm-4">
                        <input class="form-control" id="siteName" name="siteName" type="text" value="${siteName}" disabled >



                    </div>
                </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label">*上课场地：</label>
                    <input type="hidden" id="selSiteId" value="${item.siteId}">

                    <div class="col-sm-4">
                        <select class="form-control" id="siteId" name="siteId"  onchange="CoursePackageInfo.addTime1()" disabled >
                            <option >请选择场地</option>

                            @for(obj in site){
                            <option value="${obj.id}"  data-custom-data="1" ${obj.id == item.siteId ? 'selected=selected' : ''} >${obj.name}</option>
                            @}
                        </select>
                        <input class="form-control" id="siteName1" name="siteName" type="text" value="${siteName}" disabled >
                    </div>
                </div>


                <div class="form-group"  id="half1"  hidden="hidden">
                    <label class="col-sm-3 control-label">*选择半场：</label>
                    <div class="col-sm-4">
@@ -76,7 +63,6 @@
                        </select>
                    </div>
                </div>

                <div class="form-group">
                    <input type="hidden" id="selDate" value="${date}">
                    <label class="col-sm-3 control-label">预约时间：</label>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/Operator.html

@@ -39,8 +39,6 @@
                            <#button name="编辑" icon="fa-edit" clickFun="TSite.openInfo()" space="true"/>
                            <#button name="冻结" icon="fa-remove" clickFun="TSite.offShelf()" space="true"/>
                            <#button name="解冻" icon="fa-check" clickFun="TSite.onShelf()" space="true"/>
                            <#button name="绑定" icon="fa-check" clickFun="TSite.auth()" space="true"/>

                            <#button name="重置密码" icon="fa-search" clickFun="TSite.reload()" space="true"/>
                        </div>
                        <#table id="TSiteTable"/>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html

@@ -50,7 +50,7 @@

            @if(type==1){
            <div class="form-group"   >
                <label class="col-sm-3 control-label">所属运营商：</label>
                <label class="col-sm-3 control-label" id="yys1">所属运营商：</label>
                <div class="col-sm-9">
                    <select class="form-control" id="account" name="account" onchange="TCarInfoDlg.oneChange3(this)">
                        <option value="">选择运营商</option>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetitionAudit/TCompetition_edit.html

@@ -5,6 +5,7 @@

        <div class="form-horizontal" id="carInfoForm">
            <input hidden id="id" value="${item.id}">
            <input hidden id="state" value="${state}">
            <input hidden id="s1" value="${item.registerCondition}">
            <input hidden id="q1" value="${item.cashPrice}">
            <input hidden id="q2" value="${item.playPaiCoin}">
@@ -177,13 +178,39 @@
<script>

    window.onload = function() {
        var q1=$("#q1").val();
        var q2=$("#q2").val();
        var q3=$("#q3").val();
        console.log("看看钱")
        console.log(q1)
        console.log(q2)
        console.log(q3)
        if (q1==""){
            $("#payType1").hide();
        }else{
            var elementById = document.getElementById("t1");
            elementById.checked = true;
            $("#payType1").show();
        }
        if (q2==""){
            $("#payType2").hide;
        }else{
            var elementById1 = document.getElementById("t2");
            elementById1.checked = true;
            $("#payType2").show();
        }
        if (q3==""){
            $("#payType3").hide;
        }else{
            var elementById2 = document.getElementById("t3");
            elementById2.checked = true;
            $("#payType3").show();
        }
        if($("#type").val()==1){
            $("#types").html("待审核").css("color","goldenrod")
        }else if($("#type").val()==3){
            $("#types").html("未通过").css("color","red")
        }



        var OBJradio = document.getElementsByName("registerCondition")
        for (i = 0; i < OBJradio.length; i++) {//循环查找这个radio
@@ -215,6 +242,11 @@

    function editSubmit(){
        let audit = document.querySelector('input[name="auditType"]:checked').value;
        var state = $("#state").val();
        if(state==3){
            Feng.error("当前赛事状态不能再审核!")
            return ;
        }
        let text = $("#text").val()
        if(audit==3){
            if(text==''){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html

@@ -173,13 +173,13 @@
                            <label class="col-sm-3 control-label">*用户人群: </label>
                            <input class="col-sm-1 control-label" name="userGroup" type="radio"
                                   value="1" checked style="margin-top: 10px"/>
                            <label class="col-sm-1" style="margin-left: -15px;width: 16%;margin-top: 7px">全部用户</label>
                            <label class="col-sm-1" id="u1" style="margin-left: -15px;width: 16%;margin-top: 7px">全部用户</label>
                            <input class="col-sm-1 control-label" name="userGroup" type="radio"
                                   value="2"  style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
                            <label class="col-sm-1" style="width: 16%;margin-top: 7px">年度会员</label>
                            <input class="col-sm-1 control-label" name="userGroup" type="radio"
                            <label class="col-sm-1"id="u2" style="width: 16%;margin-top: 7px">年度会员</label>
                            <input class="col-sm-1 control-label"  name="userGroup" type="radio"
                                   value="3"  style="margin-left: 4%;margin-top: 10px;width: 13px;height: 13px"/>
                            <label class="col-sm-1" style="width: 18%;margin-top: 5px">已有学员用户</label>
                            <label class="col-sm-1" id="u3" style="width: 18%;margin-top: 5px">已有学员用户</label>
                        </div>
                    </div>
                    

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCouponExamine/TCouponExamineInfo.html

@@ -49,6 +49,7 @@
        <input hidden id="three" value="${three}">
        <input hidden id="city" value="${city}">
        <input hidden id="objectType" value="${objectType}">
        <input hidden id="state" value="${state}">
        <div class="form-horizontal">
            <div class="row">
                <div class="col-sm-6">
@@ -257,6 +258,7 @@
                </div>
            </div>
            @if(objectType == 1){
            @if(cover!=""){
            <div class="row" id="app" >
                <div class="col-sm-6">
                    <div class="form-group">
@@ -268,7 +270,8 @@

                </div>
            </div>

            @}
            @if(productImages!=""){
            <div class="row" id="app1" >
                <div class="col-sm-6" style="width: 100%">
                    <div class="form-group">
@@ -283,6 +286,7 @@
                </div>
            </div>
            @}
            @}
            <div class="row" id="belongsCon" >
                <div class="col-sm-6">
                    <div class="form-group">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscountAudit/coursePackageDiscount.html

@@ -5,6 +5,7 @@
            <div class="row">
                <input type="hidden" id="id" value="${item.id}">
                <input type="hidden" id="type2" value="${type2}">
                <input type="hidden" id="type" value="${type}">

                <input type="hidden" id="coursePackagePaymentConfig" value='${coursePackagePaymentConfig}'>
                <div class="form-group">
@@ -42,10 +43,10 @@
                    <div class="col-sm-10">
                        <div class="col-sm-2">
                        </div>
                        @if(type2 == 3){

                        <div class="col-sm-6" id="classHours" style="margin-top: 6px;">
                        </div>
                        @}


                    </div>
                </div>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoodsAudit/TGoodsAudit.html

@@ -2,7 +2,7 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">

            <input hidden id="userType" value="${userType}">
            <div class="ibox-title">
                <h5>门票审核管理</h5>
            </div>

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

@@ -26,7 +26,7 @@
        },
        {title: '结束时间', field: 'endTime', visible: true, align: 'center', valign: 'middle',width:'5%',
        },
        {title: '最大人数-已报名人数', field: 'applicantsNumber', visible: true, align: 'center', valign: 'middle',width:'8%',
        {title: '最大人数-已报名人数', field: 'count', visible: true, align: 'center', valign: 'middle',width:'8%',
        },
        {title: '报名条件', field: 'registerCondition', visible: true, align: 'center', valign: 'middle',width:'8%',
            formatter:function (data) {
@@ -131,6 +131,7 @@
        this.layerIndex = index;
    }
};

TCompetition.user = function () {
    if (this.check()) {
        var index = layer.open({

 cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js

@@ -571,8 +571,15 @@

    console.log("===========oneId=========="+oneId)
    var SelectValue="";
    if(SelectValue=='0' ){
    if(oneId=='0' ){
        oneId=0
        console.log("隐藏")
        $("#yys1").hide();
        $("#account").hide();
    }else{
        console.log("展示")
        $("#yys1").show();
        $("#account").show();
    }
    // var ajax = new $ax(Feng.ctxPath + "/tSite/getChangeOne", function(data){
    //     if(data!=null){

 cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js

@@ -321,6 +321,13 @@
}
couponInfoDlg.audit = function () {
    var id = $("#id").val();
    var state = $("#state").val();
    console.log("让我看看state")
    console.log(state)
    if (state == "未通过"){
        Feng.error("当前优惠券不可再次审核！");
        return ;
    }
    let audit = document.querySelector('input[name="r1"]:checked').value;
    let text = $("#text").val()
    if(audit==3){
@@ -666,7 +673,8 @@
        distributionMethodOptions[i].addEventListener('change', function() {
            // 获取选中的distributionMethod值
            const selectedDistributionMethod = document.querySelector('input[name="distributionMethod"]:checked').value;

            console.log("看看选择")
            console.log(selectedDistributionMethod);
            // 判断选中的值是否不等于1
            if (selectedDistributionMethod !== '1') {
                console.log("已经选择1")
@@ -680,6 +688,33 @@
                document.getElementById('needAmount').style.display = 'block';
                document.getElementById('needIntegral').style.display = 'block';
            }
            // 如果选择发放方式为注册赠送
            if (selectedDistributionMethod == "2"){
                const userGroupRadios = document.querySelectorAll('input[name="userGroup"][value="1"], input[name="userGroup"][value="3"]');
                console.log("看看要隐藏的")
                console.log(userGroupRadios)
                // 隐藏值为 1 或 2 的 radio 按钮，并显示值为 2 的 radio 按钮
                userGroupRadios.forEach(userRadio => {
                    console.log("隐藏啊")
                    userRadio.style.display = 'none';
                });
                $('#u1').hide();
                $('#u3').hide();
                const userGroupTwo = document.querySelector('input[name="userGroup"][value="2"]');
                userGroupTwo.style.display = 'inline-block';
                userGroupTwo.checked = true;
            }else{
                // 如果选择的不是值为 2 的 radio 按钮，则显示所有的 userGroup radio 按钮
                const userGroupRadios = document.querySelectorAll('input[name="userGroup"]');
                userGroupRadios.forEach(userRadio => {
                    userRadio.style.display = 'inline-block';
                });
                const userGroupTwo = document.querySelector('input[name="userGroup"][value="1"]');
                userGroupTwo.style.display = 'inline-block';
                userGroupTwo.checked = true;
                $('#u1').show();
                $('#u3').show();
            }
        });
    }


 cloud-server-management/src/main/webapp/static/modular/system/tDiscountAudit/coursePackageDiscount.js

@@ -20,6 +20,11 @@

CoursePackageDiscount.audit = function () {
    var id = $("#id").val();
    var type = $("#type").val();
    if (type=="未通过"){
        Feng.error("当前状态不能再次审核！")
        return ;
    }
    let audit = document.querySelector('input[name="r1"]:checked').value;
    let text = $("#text").val()
    if(audit==3){
@@ -430,6 +435,9 @@

    let index = $('#classHours').find('button[checked]').attr('index');
    let obj = CoursePackageDiscount.coursePackagePaymentConfig[index];
    console.log(obj)
    console.log("看看obj")

    $('#payment').text(obj.payment);
    $('#cashPayment').text(obj.cashPayment);

@@ -453,6 +461,11 @@


$(function () {
    var type2 = $('#type2').val();
    if (type2 == 3){
        console.log("进入隐藏")
        $('#classHours').hide();
    }
    CoursePackageDiscount.coursePackagePaymentConfig = JSON.parse($('#coursePackagePaymentConfig').val());
    let htmlStr = '';
    for (let i = 0; i < CoursePackageDiscount.coursePackagePaymentConfig.length; i++) {

 cloud-server-management/src/main/webapp/static/modular/system/tDiscountAudit/tDiscount.js

@@ -201,7 +201,11 @@
                layer.closeAll();
            },
            btn2:function () {

                var state = TCompetition.seItem.status;
                if (state == 3){
                    Feng.error("当前状态不能再次审核!")
                    return false;
                }
                let audit = document.querySelector('input[name="r1"]:checked').value;
                let text = $("#text").val()
                if(audit==3){

 cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js

@@ -247,9 +247,7 @@

    this.clearData();
    this.collectData();
    if(!this.validate()){
        return ;
    }
    

    const quantityIssuedInput = document.getElementById('quantityIssued');
    const pickUpQuantityInput = document.getElementById('pickUpQuantity');
@@ -622,12 +620,11 @@

}
TGoodsInfoDlg.addSubmit1 = function() {
    console.log("看看进入")
    let company = 3;
    this.clearData();
    this.collectData();
    if(!this.validate()){
        return ;
    }

    var cityIds = [];
    var cts = "";
    if (company === '2'){

 cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js

@@ -156,6 +156,8 @@
                , btnAlign: 'c' //按钮居中
                , shade: 0.5 //不显示遮罩
                , yes: function () {


                    var OBJradio= $("input[name='type1']:checked").val();
                    console.log(OBJradio)
                   let remark =  $("#remark").val()

 cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java

@@ -24,17 +24,18 @@
    /**
     * 每隔一分钟去处理的定时任务
     */
    //预约场地后，待支付的订单 时间超过30分钟，不保留
    @Scheduled(fixedRate = 60000)
    public void taskMinute(){
        try {
            List<SiteBooking> siteBookings = siteBookingMapper.selectList(new LambdaQueryWrapper<SiteBooking>().eq(SiteBooking::getStatus, 0));
            List<SiteBooking> siteBookings = siteBookingMapper.
                    selectList(new LambdaQueryWrapper<SiteBooking>().eq(SiteBooking::getStatus, 0));
            for (SiteBooking siteBooking : siteBookings) {
                long time = siteBooking.getInsertTime().getTime();
                long l = time + 1800 * 1000;
                if(System.currentTimeMillis()>l){
                    siteBooking.setStatus(5);
                    siteBookingMapper.updateById(siteBooking);

                    siteBookingMapper.deleteById(siteBooking.getId());
                }
            }
            //定时修改赛事状态
@@ -49,14 +50,14 @@
    @Scheduled(fixedRate = 60000)
    public void taskMinute1(){
        try {
            List<SiteBooking> siteBookings = siteBookingMapper.selectList(new LambdaQueryWrapper<SiteBooking>().eq(SiteBooking::getStatus, 1));
            List<SiteBooking> siteBookings = siteBookingMapper.selectList
                    (new LambdaQueryWrapper<SiteBooking>().eq(SiteBooking::getStatus, 1));
            for (SiteBooking siteBooking : siteBookings) {
                    long time = siteBooking.getEndTime().getTime();
                    if (System.currentTimeMillis() > time) {
                        siteBooking.setStatus(4);
                        siteBookingMapper.updateById(siteBooking);
                    }

            }
            //定时修改赛事状态
        } catch (Exception e) {
@@ -64,5 +65,24 @@
        }
    }

    // 预约场地后，待支付的订单 时间超过30分钟，不保留
    @Scheduled(fixedRate = 60000)
    public void taskMinute2(){
        try {
            // 获取待核销状态的记录
            List<SiteBooking> siteBookings = siteBookingMapper.selectList(new LambdaQueryWrapper<SiteBooking>()
                    .eq(SiteBooking::getStatus, 1));
            for (SiteBooking siteBooking : siteBookings) {
                long time = siteBooking.getEndTime().getTime();
                if (System.currentTimeMillis() > time) {
                    siteBooking.setStatus(4);
                    siteBookingMapper.updateById(siteBooking);
                }
            }
            //定时修改赛事状态
        } catch (Exception e) {
            e.printStackTrace();
        }
    }

}