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

puzhibing

2024-03-12 032f7c07e272dae9a857ed76b480dc391dc4073f

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

@@ -1710,12 +1710,19 @@
                }
            }else if (byId.getUseScope()==4){
                // 如果是指定场地
                List<Integer> collect1 = list.stream().map(PointsMerchandiseStore::getSiteId).collect(Collectors.toList());
                List<Integer> collect1 = list.stream().map(PointsMerchandiseStore::getSiteId).distinct().collect(Collectors.toList());
                int temp =0;
                List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
                List<Store> stores1 = new ArrayList<>();
                for (Integer integer : collect) {
                    List<Integer> list1 = new ArrayList<>();
                    list1.add(integer);
                    List<Store> stores = stoClient.queryStoreByIds(list1);
                    stores1.addAll(stores);
                }
                List<Store> stores = stoClient.queryStoreByIds(collect);
                while (temp!=collect1.size()){
                    for (Store store : stores) {
                    for (Store store : stores1) {
                        Integer integer = collect1.get(temp);
                        Site site = siteClient.querySiteById(integer);
                        StoreVos storeVos1 = new StoreVos();

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

@@ -78,6 +78,8 @@
    private TOperatorService tOperatorService;
    @Autowired
    private ITSiteService siteService;
    @Autowired
    private IUserService userService;

    /**
     * 跳转到优惠券管理首页
@@ -231,16 +233,28 @@
        Gate byId = gateService.getById(id);
        model.addAttribute("id",id);
        model.addAttribute("data",byId);
        TStore byId2 = storeService.getById(byId.getStoreId());
        model.addAttribute("type",byId2.getType());
        Integer objectType = UserExt.getUser().getObjectType();
        model.addAttribute("userType",objectType);
        System.out.println(objectType);
        List<TOperator> list1 = tOperatorService.list();
        List<TOperator> list1 = tOperatorService.list(new QueryWrapper<TOperator>()
                .eq("state", 1));
        model.addAttribute("yysList",list1);
        if (UserExt.getUser().getObjectType()==1) {
            List<TStore> list = storeService.list(new QueryWrapper<TStore>()
                    .eq("operatorId", 0)
                    .ne("state", 3));
            model.addAttribute("storeList",list);
            List<TStore> tStores = new ArrayList<>();
            if (byId.getOperatorId()==0){
                tStores = storeService.list(new QueryWrapper<TStore>()
                        .eq("operatorId", 0)
                        .eq("type", 1)
                        .ne("state", 3));
            }else{
                tStores = storeService.list(new QueryWrapper<TStore>()
                        .eq("operatorId", 0)
                        .eq("type", 2)
                        .ne("state", 3));
            }
            model.addAttribute("storeList",tStores);
            List<TSite> siteList = siteService.list(new QueryWrapper<TSite>()
                    .eq("storeId", byId.getStoreId())
                    .ne("state",3));
@@ -281,7 +295,17 @@
        return PREFIX + "gate_edit.html";
    }

    /**
     * 获取运营商列表
     */
    @RequestMapping(value = "/getOperatorList")
    @ResponseBody
    public List<TOperator> getOperatorList() {
        List<TOperator> list = tOperatorService.list(new QueryWrapper<TOperator>()
                .eq("state", 1));
        return list;

    }
    /**
     * 获取闸机列表
     */
@@ -306,6 +330,24 @@
            storeIds.add(UserExt.getUser().getObjectId());
        }
        List<Map<String,Object>> res = gateService.listAll(name,device,operatorName,storeName,storeIds,page);
        for (Map<String, Object> re : res) {
            Integer integer = Integer.valueOf(re.get("type").toString());
            if (integer==1){
                re.put("operatorName","平台闸机");
            }else{
                TStore storeId = storeService.getById(Integer.valueOf(re.get("storeId").toString()));
                if (storeId!=null){
                    Integer operatorId = storeId.getOperatorId();
                    TOperator byId = tOperatorService.getById(operatorId);
                    if (byId!=null){
                        User byId1 = userService.getById(byId.getUserId());
                        if (byId1!=null){
                            re.put("operatorName",byId1.getName()+"-"+byId1.getPhone());
                        }
                    }
                }
            }
        }
        return res;
    }
    /**
@@ -314,10 +356,19 @@
    @RequestMapping(value = "/getStore")
    @ResponseBody
    public List<TStore> getStore(Integer operatorId) {
        List<TStore> list = storeService.list(new QueryWrapper<TStore>()
                .eq("operatorId", operatorId)
                .ne("state", 3));
        return list;
        List<TStore> tStores = new ArrayList<>();
        if (operatorId==0){
            tStores = storeService.list(new QueryWrapper<TStore>()
                    .eq("type", 1)
                    .ne("state", 3));
        }else{
            tStores = storeService.list(new QueryWrapper<TStore>()
                    .eq("operatorId", operatorId)
                    .eq("type", 2)
                    .ne("state", 3));
        }

        return tStores;

    }
    /**

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

@@ -275,13 +275,52 @@
            strings.add(cityManager.getCity());
        }
        HashSet<String> set1 = new HashSet<String>(strings);
        List<Store> stores = new ArrayList<>();
        if (objectType ==2 ){
            stores= storeClient.getStoreByCityManagerId(objectId);
        }else if(objectType == 3){
            stores= storeClient.getStoreByStoreStaffId(objectId);;
        List<TStore> stores = new ArrayList<>();
//        // 先判断
//        if (objectType ==2 ){
//            stores= storeClient.getStoreByCityManagerId(objectId);
//        }else if(objectType == 3){
//            stores= storeClient.getStoreByStoreStaffId(objectId);;
//        }else{
//            stores = storeClient.getStore(site.getCity());
//        }
        // 根据门店id 确定是平台还是运营商的
        TStore byId = storeService.getById(site.getStoreId());
        if (byId.getType()==1){
            // 查询平台的门店
            if (objectType ==2 ){
                stores = storeService.list(new QueryWrapper<TStore>()
                        .eq("state", 1)
                        .eq("type", 1)
                .eq("operatorId",objectId));
            }else if (objectType ==2 ){
                stores = storeService.list(new QueryWrapper<TStore>()
                        .eq("state", 1)
                        .eq("id",objectId));
            }else{
                stores = storeService.list(new QueryWrapper<TStore>()
                        .eq("state", 1)
                        .eq("type", 1)
                );
            }
        }else{
            stores = storeClient.getStore(site.getCity());
            // 查询平台的门店
            if(objectType == 2){
                stores = storeService.list(new QueryWrapper<TStore>()
                        .eq("state", 1)
                        .eq("type", 2)
                .eq("operatorId",objectId));
            }else if (objectType == 3){
                stores = storeService.list(new QueryWrapper<TStore>()
                        .eq("state", 1)
                        .eq("id",objectId));
            }else{
                stores = storeService.list(new QueryWrapper<TStore>()
                        .eq("state", 1)
                        .eq("type", 2)
                        );
            }

        }
        List<CityManager> accounts = cityManagerClient.getAccount(site.getCity());
        model.addAttribute("list",site);
@@ -294,6 +333,7 @@
        model.addAttribute("type",1);
        model.addAttribute("objectType",objectType);
        model.addAttribute("objectId",objectId);

        model.addAttribute("stores",stores);

        String nextName = site.getNextName();
@@ -471,8 +511,7 @@
        site.setCityManagerId(cityManagerId);
        site.setInsertTime(new Date());
        site.setState(1);
        site.setOperatorId(UserExt.getUser().getObjectId());

//        site.setOperatorId(UserExt.getUser().getObjectId());

        // 添加场地
        HashMap<String, String> map = new HashMap<>();

 cloud-server-management/src/main/resources/mapper/GateMapper.xml

@@ -3,14 +3,12 @@
<mapper namespace="com.dsh.course.mapper.GateMapper">

    <select id="listAll" resultType="java.util.Map">
        select t1.id as id,t1.name as name,t1.device as device,
        ifNull(CONCAT(t5.name,'-',t5.phone),'平台闸机') as operatorName,
        select t1.id as id,t1.name as name,t1.device as device,t2.type,t1.storeId,
        t2.name as storeName,t3.name as siteName
        from t_gate t1
        left join t_store t2 on t2.id = t1.storeId
        left join t_site t3  on t3.id = t1.siteId
        left join t_operator t4 on t4.id = t1.operatorId
        left join sys_user t5   on   t5.id = t4.userId
        where 1=1 and t1.isDelete = 0
        <if test="name != null and name!=''">
            and t1.name like CONCAT('%',#{name},'%')

 cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_add.html

@@ -163,25 +163,24 @@
            });
            ajax.set("operatorId",e);
            ajax.start();

        }else {
            selectElement.disabled = false;
            var ajax = new $ax(Feng.ctxPath + "/tShop/typeChange", function(data){
            var ajax = new $ax(Feng.ctxPath + "/gate/getOperatorList", function(data){
                if(data!=null){
                    var content = '<option value="">请选择</option>';
                    var content="<option value=''>选择运营商</option>";
                    $.each(data, function(k,v) {

                        content += "<option value='"+v.id+"'>"+v.name+"</option>";
                    });
                    $("#page").empty().append(content);
                    $("#account").empty().append(content);
                }
            });
            ajax.set("name",oneId);
            ajax.start();
            selectElement.disabled = false;
            var content="<option value=''>请选择运营商</option>";

            $("#store").empty().append(content);

        }
        var pageElement = document.getElementById('page');
        var event = new Event('change');
        pageElement.dispatchEvent(event);

    }



 cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_edit.html

@@ -44,6 +44,7 @@
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
<div class="ibox float-e-margins">
    <input hidden id="userType" value="${userType}">
    <input hidden id="type" value="${type}">
    <input hidden id="id" value="${id}">
    <input hidden id="operatorId" value="${operatorId}">
    @if(userType==3){
@@ -71,9 +72,13 @@
                    <label class="col-sm-3 control-label">*所属运营商：</label>
                    <div class="col-sm-9">
                        <select class="form-control" disabled id="account" name="account" onchange="TCarInfoDlg.getStore(this)" >
                            @if(data.operatorId==0){
                            <option value="">选择运营商</option>
                            @}
                            @for(obj in yysList){
                            <option value="${obj.id}" ${obj.id == data.operatorId ? 'selected=selected' : ''}>${obj.name}</option>
                            @}

                        </select>
                    </div>
                </div>
@@ -150,50 +155,34 @@
            ajax.set("operatorId",e);
            ajax.start();
        }else {
            selectElement.disabled = false;
            var ajax = new $ax(Feng.ctxPath + "/tShop/typeChange", function(data){
            var ajax = new $ax(Feng.ctxPath + "/gate/getOperatorList", function(data){
                if(data!=null){
                    var content = '<option value="">请选择</option>';
                    var content="<option value=''>选择运营商</option>";
                    $.each(data, function(k,v) {

                        content += "<option value='"+v.id+"'>"+v.name+"</option>";
                    });
                    $("#page").empty().append(content);
                    $("#account").empty().append(content);
                }
            });
            ajax.set("name",oneId);
            ajax.start();
            selectElement.disabled = false;

                    var content="<option value=''>请选择运营商</option>";

                    $("#store").empty().append(content);
        }
        var pageElement = document.getElementById('page');
        var event = new Event('change');
        pageElement.dispatchEvent(event);
    }



    function updatePosition(e) {
        var oneId=$(e).val();
        var res= document.getElementById("imgPX");
        console.log(res)
        if (oneId == "1"){
            res.innerHTML ="推荐像素:780x472px";
        }else{
            res.innerHTML ="推荐像素:780x440px";
        }
        console.log(oneId)
    }
    window.onload = function(){
        // 如果是0则是平台闸机
        var temp = $("#operatorId").val();
        console.log("看看运营商id")
        console.log(temp)
        // 如果是1平台 2运营商
        var temp = $("#type").val();
        // 如果不是平台闸机
        if (temp!=0){
        if (temp!=1){
            var selectElement = document.getElementById('account');
            selectElement.disabled = false;
        }
        var OBJradio1=document.getElementsByName("type")
        if($("#operatorId").val()==OBJradio1[0].value){//判断是否与radio的值相同
        if(temp==1){//判断是否与radio的值相同
            OBJradio1[0].checked=true//修改选中状态
        }else{
            OBJradio1[1].checked=true//修改选中状态

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

@@ -164,17 +164,25 @@
    ajax.start();
};
TSite.oneChangeYys = function(e){

    var oneId = $(e).val();

    var checkbox = document.querySelector('input[name="pt"]');
    if (checkbox.checked) {
        oneId=0;
        console.log("选中是平台");
    } else {
    }else{
        oneId = 1;
        console.log("运营商");
        console.log(oneId)
    }
    if (oneId == "1"){
        oneId = $("#yys").val()
        if (oneId==""){
            oneId = 1
        }
        console.log("看看选择之后")
        console.log(oneId)
        var button = document.getElementById("yys");
        button.removeAttribute("disabled");
    }
    var ajax = new $ax(Feng.ctxPath + "/tSite/getChangeOne", function(data){
        if(data!=null){
@@ -189,8 +197,6 @@
                $("#yys").prop('disabled', false);
            }

            console.log("看看返回数据")
            console.log(data)
            var content='<option value="">选择门店</option>';
            $.each(data, function(k,v) {
                content += "<option value='"+v.id+"'>"+v.name+"</option>";
@@ -199,12 +205,7 @@
        }
    });

    if (oneId == "1"){
        console.log("===============")
        oneId = $("#yys").val()
        var button = document.getElementById("yys");
        button.removeAttribute("disabled");
    }


    ajax.set("oneId",oneId);
    ajax.start();

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

@@ -513,18 +513,39 @@
};

TSiteInfo.oneChangeYys = function(e){
    var oneId=$(e).val();
    var SelectValue="";
    var getSelectValueMenbers = $("input[name='pt']:checked").each(function(j) {
        if (j >= 0) {
            SelectValue += $(this).val()
    var oneId = $(e).val();
    var checkbox = document.querySelector('input[name="pt"]');
    if (checkbox.checked) {
        oneId=0;
        console.log("选中是平台");
    }else{
        oneId = 1;
        console.log("运营商");
        console.log(oneId)
    }
    if (oneId == "1"){
        oneId = $("#yys").val()
        if (oneId==""){
            oneId = 1
        }
    });
    if(SelectValue=='0' ){
        oneId=0
        console.log("看看选择之后")
        console.log(oneId)
        var button = document.getElementById("yys");
        button.removeAttribute("disabled");
    }
    var ajax = new $ax(Feng.ctxPath + "/tSite/getChangeOne", function(data){
        if(data!=null){
            // var content1 = '<option value="0">平台</option>';
            console.log("看看oneId")
            console.log(oneId)
            if (oneId == 0) {
                console.log("锁住")
                $("#yys").prop('disabled', true);
            }else{
                console.log("放开")
                $("#yys").prop('disabled', false);
            }

            var content='<option value="">选择门店</option>';
            $.each(data, function(k,v) {
                content += "<option value='"+v.id+"'>"+v.name+"</option>";
@@ -532,6 +553,9 @@
            $("#store").empty().append(content);
        }
    });



    ajax.set("oneId",oneId);
    ajax.start();
};