Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

puzhibing

2024-03-11 50a4e8cae497f7b5071df1153365a776cc9c6a5f

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

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

@@ -909,7 +909,6 @@
                                        list4.add(43);
                                        detailsResponse.setRid(list4);
                                    }

                                }
                            }
                            //======================================================

 cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupClient.java

@@ -110,6 +110,10 @@
    void changeScore(ChangeScore changeScore);


    @PostMapping("/worldCup/getUserGameRecordList")
    Map<String, Object> getUserGameRecordList(WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList);


    /**
     * 获取用户比赛记录
     * @param userGameRecordList

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

@@ -168,6 +168,20 @@
    }



    /**
     * 获取用户比赛列表
     * @param worldCupGameStatisticsInfoList
     * @return
     */
    @ResponseBody
    @PostMapping("/getUserGameRecordList")
    public Object getUserGameRecordList(WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList){
        return worldCupClient.getUserGameRecordList(worldCupGameStatisticsInfoList);
    }



    /**
     * 获取用户比赛记录
     * @param userGameRecordList

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

@@ -59,6 +59,8 @@
                Feng.info("请选择相同运营商场地")
                return ;
            }
            console.log("arr push")
            console.log(selected[i].id)
            arr.push({
                id: selected[i].id,
                provinceCity: typeof selected[i].provinceCity != "undefined" ? selected[i].provinceCity : "",
@@ -69,11 +71,11 @@
            })
        }
    }
    console.log("看看选择的场地")
    console.log("返回之前的数组")
    console.log(arr)
    window.parent.TGoodsInfoDlg.selecUserOpt1(arr);
    TStoreProvince.storeOfClosePage();
}
};




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

@@ -140,7 +140,6 @@
TGoodsInfoDlg.selecUserOpt = function (arrays){
    //获取所有的值
    var subArr= this.storeIds;
    console.log(subArr)
    $(".timeClass").each(function () {
        subArr.push($(this).find("input[name*='id']").val());
    });
@@ -163,11 +162,16 @@
                '</td><td><button onclick="deleteSub(this)">移除</button></td></tr>';
        }
    }
    console.log("添加门店后的场地数组和门店数组")
    console.log(this.storeIds)
    console.log(this.siteIds)
    $("#coun").append(str);
}
TGoodsInfoDlg.selecUserOpt1 = function (arrays){
    console.log("进入")
    console.log(arrays)
TGoodsInfoDlg.selecUserOpt1 = function (arr){
    console.log(arr)
    console.log("返回的数组")
    console.log("此时的site集合")
    console.log(this.siteIds)
    //获取所有的值
    var subArr= this.siteIds;
    console.log(subArr)
@@ -175,25 +179,29 @@
        subArr.push($(this).find("input[name*='id']").val());
    });
    var str = '';
    for(var i in arrays){
    for(var i in arr){
        var b = true;
        for(var j in subArr){
            if(arrays[i].id === Number(subArr[j])){
            if(arr[i].id === Number(subArr[j])){
                b = false;
                break
            }
        }
        if(b){
            this.siteIds.push(arrays[i].id)
            this.siteIds.push(arr[i].id);
            console.log("场地push")
            console.log(arr[i].id)
            str += '<tr class="timeClass">' +
                '<td><input type="hidden" id="id" name="id" value="'+arrays[i].id+'"><input type="hidden" id="provinceCity" name="provinceCity" value="'+arrays[i].provinceCity+'">' + arrays[i].provinceCity + '</td>' +
                '<td><input type="hidden" id="accountName" name="accountName" value="'+arrays[i].accountName+'">' + arrays[i].accountName + '</td>' +
                '<td><input type="hidden" id="name" name="name" value="'+arrays[i].name+'">' + arrays[i].name +
                '<td><input type="hidden" id="siteName" name="siteName" value="'+arrays[i].siteName+'">' + arrays[i].siteName +
                '<td><input type="hidden" id="ids" name="ids" value="'+arrays[i].ids+'">' + arrays[i].ids +
                '<td><input type="hidden" id="id" name="id" value="'+arr[i].id+'"><input type="hidden" id="provinceCity" name="provinceCity" value="'+arr[i].provinceCity+'">' + arr[i].provinceCity + '</td>' +
                '<td><input type="hidden" id="accountName" name="accountName" value="'+arr[i].accountName+'">' + arr[i].accountName + '</td>' +
                '<td><input type="hidden" id="name" name="name" value="'+arr[i].name+'">' + arr[i].name +
                '<td><input type="hidden" id="siteName" name="siteName" value="'+arr[i].siteName+'">' + arr[i].siteName +
                '<td><input type="hidden" id="ids" name="ids" value="'+arr[i].ids+'">' + arr[i].ids +
                '</td><td><button onclick="deleteSub1(this)">移除</button></td></tr>';
        }
    }
    console.log("这是场地ids")
    console.log(this.siteIds)
    $("#coun1").append(str);
}
function deleteSub(e) {
@@ -677,6 +685,9 @@

}
TGoodsInfoDlg.addSubmit1 = function() {
    console.log("看看门店ids和场地ids")
    console.log(this.siteIds)
    console.log(this.storeIds)
    var company = 3;
    var radioButtons = document.getElementsByName("company");
    for (var i = 0; i < radioButtons.length; i++) {
@@ -885,7 +896,6 @@
        ajax.set("typeAll",3);
        ajax.set("name",name);
        ajax.set("price",price);
        ajax.set("sites",sites);
        ajax.set("type",type);
        ajax.set("integral",integral);
        ajax.set("cash",cash);
@@ -897,6 +907,7 @@
        ajax.set("startTime",startTime);
        ajax.set("useScope",company);
        ajax.set("cityIds",cts);
        ajax.set("sites",sites);
        ajax.set("storeIds",stores);
        ajax.set("text",text);
        ajax.set("sort",sort);

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

@@ -116,6 +116,7 @@
    this.layerIndex = index;
}
TGoodsInfoDlg.selecUserOpt = function (arrays){
    console.log("这是另一个js")
    console.log(arrays)
    //获取所有的值
    var subArr= this.storeIds;
@@ -142,34 +143,7 @@
    $("#coun").append(str);
    console.log('storeIds',this.storeIds)
}
TGoodsInfoDlg.selecUserOpt1 = function (arrays){
    console.log(arrays)
    //获取所有的值
    var subArr= this.storeIds;
    $(".timeClass").each(function () {
        subArr.push($(this).find("input[name*='id']").val());
    });
    var str = '';
    for(var i in arrays){
        var b = true;
        for(var j in subArr){
            if(arrays[i].id === Number(subArr[j])){
                b = false;
                break
            }
        }
        if(b){
            this.storeIds.push(arrays[i].id)
            str += '<tr class="timeClass">' +
                '<td><input type="hidden" id="id" name="id" value="'+arrays[i].id+'"><input type="hidden" id="provinceCity" name="provinceCity" value="'+arrays[i].provinceCity+'">' + arrays[i].provinceCity + '</td>' +
                '<td><input type="hidden" id="accountName" name="accountName" value="'+arrays[i].accountName+'">' + arrays[i].accountName + '</td>' +
                '<td><input type="hidden" id="name" name="name" value="'+arrays[i].name+'">' + arrays[i].name + '</td>' +
                '<td><input type="hidden" id="siteName" name="siteName" value="'+arrays[i].siteName+'">' + arrays[i].siteName + '</td>' +
                '<td><button onclick="deleteSub(this)">移除</button></td></tr>';
        }
    }
    $("#coun1").append(str);
}

function deleteSub(e) {
    console.log(e);
    var row = $(e).closest('tr');

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

@@ -476,64 +476,62 @@
    data.isCanBeBooked= reservation;
    console.log("看看是否可预约值")
    console.log(reservation);
    if (reservation==1){
    if (reservation == 1) {
        if (data.typeName === "智慧场地") {
            console.log("===========这是智慧球场")

            console.log("=====" + data.appointmentStartTime)

            var value = data.appointmentStartTime;
            var lastTwoDigits = value.slice(-2);

            if (lastTwoDigits === "00" || lastTwoDigits === "15" || lastTwoDigits === "30" || lastTwoDigits === "45") {
                console.log("Last two digits are 00, 15, 30, or 45");
            } else {
                Feng.error("智慧场地的可预约时间段是15分钟的倍数")
                return;

            }


    if (data.typeName === "智慧场地"){
        console.log("===========这是智慧球场")
            var value1 = data.appointmentEndTime;
            var lastTwoDigits1 = value1.slice(-2);

        console.log("====="+data.appointmentStartTime)
            if (lastTwoDigits1 === "00" || lastTwoDigits1 === "15" || lastTwoDigits1 === "30" || lastTwoDigits1 === "45") {
                console.log("Last two digits are 00, 15, 30, or 45");
            } else {
                Feng.error("智慧场地的可预约时间段是15分钟的倍数")
                return;

        var value = data.appointmentStartTime;
        var lastTwoDigits = value.slice(-2);
            }

        if (lastTwoDigits === "00" || lastTwoDigits === "15" || lastTwoDigits === "30" || lastTwoDigits === "45") {
            console.log("Last two digits are 00, 15, 30, or 45");

        } else {
            Feng.error("智慧场地的可预约时间段是15分钟的倍数")
            return;
            console.log("===========这是普通球场")

            console.log("=====" + data.appointmentStartTime)
            var value = data.appointmentStartTime;
            var lastTwoDigits = value.slice(-2);

            if (lastTwoDigits === "00" || lastTwoDigits === "30") {
                console.log("Last two digits are 00, 15, 30, or 45");
            } else {
                Feng.info("普通场地可预约时间段需是30分钟的倍数")
                return;
            }


            var value1 = data.appointmentEndTime;
            var lastTwoDigits1 = value1.slice(-2);

            if (lastTwoDigits1 === "00" || lastTwoDigits1 === "30") {
                console.log("Last two digits are 00, 15, 30, or 45");
            } else {
                Feng.info("普通场地可预约时间段需是30分钟的倍数")
                return;

            }
        }


        var value1 = data.appointmentEndTime;
        var lastTwoDigits1 = value1.slice(-2);

        if (lastTwoDigits1 === "00" || lastTwoDigits1 === "15" || lastTwoDigits1 === "30" || lastTwoDigits1 === "45") {
            console.log("Last two digits are 00, 15, 30, or 45");
        } else {
            Feng.error("智慧场地的可预约时间段是15分钟的倍数")
            return;

        }


    }else {
        console.log("===========这是普通球场")

        console.log("====="+data.appointmentStartTime)
        var value = data.appointmentStartTime;
        var lastTwoDigits = value.slice(-2);

        if (lastTwoDigits === "00" || lastTwoDigits === "30" ) {
            console.log("Last two digits are 00, 15, 30, or 45");
        } else {
            Feng.info("普通场地可预约时间段需是30分钟的倍数")
            return;
        }


        var value1 = data.appointmentEndTime;
        var lastTwoDigits1 = value1.slice(-2);

        if (lastTwoDigits1 === "00"|| lastTwoDigits1 === "30" ) {
            console.log("Last two digits are 00, 15, 30, or 45");
        } else {
            Feng.info("普通场地可预约时间段需是30分钟的倍数")
            return;

        }
    }
    }
    var SelectValue="";
    var getSelectValueMenbers = $("input[name='pt']:checked").each(function(j) {

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

@@ -166,7 +166,7 @@
            }
        },
    ];
    var table3 = new BSTable("WorldCupRecordsTable3", "/worldCupRecords/worldCupGameStatisticsInfoList", defaultColunms3);
    var table3 = new BSTable("WorldCupRecordsTable3", "/worldCupRecords/getUserGameRecordList", defaultColunms3);
    table3.setPaginationType("server");
    WorldCupRecords.table3 = table3.init();
});