1.23新增需求 bug修改

44323

2024-03-08 6d934d0ac5f783e23ec5c300a5d0c8e1dc90827d

1.23新增需求 bug修改

 cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java

@@ -27,6 +27,11 @@
    @TableField("storeId")
    private Integer storeId;
    /**
     * 是否可预约
     */
    @TableField("isCanBeBooked")
    private Integer isCanBeBooked;
    /**
     * 场地名称
     */
    @TableField("name")

 cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java

@@ -88,8 +88,8 @@
    List<Map<String, Object>> querySiteListOfpage(@Param("provinceCode") String provinceCode,
                                                  @Param("cityCode")  String cityCode,
                                                  @Param("operatorId")  Integer operatorId,
                                                  @Param("storeName")  String storeName,
                                                  @Param("page") Page<Map<String, Object>> page);
                                                  @Param("storeName")  String storeName
                                               );


}

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

@@ -225,8 +225,7 @@
            // 筛选这个运营商下的门店
            operatorId = UserExt.getUser().getObjectId();
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName,page);
        List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName);
        if (storeList.size() > 0 ){
            for (Map<String, Object> stringObjectMap : storeList) {
                String provinceName = (String) stringObjectMap.get("province");

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

@@ -101,13 +101,14 @@
                    .eq("operatorId", 0)
                    .ne("state", 3));
            model.addAttribute("storeList",list);
            model.addAttribute("operatorId",0);
        }
        if (UserExt.getUser().getObjectType()==2){
            List<TStore> list2 = storeService.list(new QueryWrapper<TStore>()
                    .eq("operatorId", UserExt.getUser().getObjectId())
                    .ne("state", 3));
            model.addAttribute("storeList",list2);
            model.addAttribute("operatorId",UserExt.getUser().getObjectId());
            model.addAttribute("operatorId",0);
        }
        if (UserExt.getUser().getObjectType()==3){
            List<TStore> list3 = new ArrayList<>();
@@ -246,6 +247,7 @@
                    .eq("storeId", byId.getStoreId())
                    .ne("state",3));
            model.addAttribute("siteList",siteList);
            model.addAttribute("operatorId",byId.getOperatorId());
        }
        if (UserExt.getUser().getObjectType()==2){
            List<TStore> list2 = storeService.list(new QueryWrapper<TStore>()

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

@@ -564,7 +564,7 @@

                if (StringUtils.hasLength(sites)){
                    Integer oid=null;
                    String[] split = storeIds.split(",");
                    String[] split = sites.split(",");
                    for (int i = 0; i < split.length; i++) {
                        if(i==0){
                            Integer operatorId = siteService.getById(split[0]).getOperatorId();

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

@@ -422,7 +422,11 @@
        model.addAttribute("c8",c8);
        model.addAttribute("id",id);
        StoreConfig c9 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,9));
        model.addAttribute("c9",c9);
        if (c9==null){
            model.addAttribute("c9",new StoreConfig());
        }else{
            model.addAttribute("c9",c9);
        }
        return PREFIX + "TShop_imgAll.html";
    }

@@ -744,12 +748,27 @@
    }

    private StoreConfig collect(Integer id,Integer sort,Integer isOpen,String img,int type){
        StoreConfig one = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType, type));
        one.setSort(sort);
        one.setIsOpen(isOpen);
        if(ToolUtil.isNotEmpty(img)){
            one.setBackgroundImage(img);
        StoreConfig one = storeConfigService.getOne(new QueryWrapper<StoreConfig>()
                .eq("storeId", id)
                .eq("type", type));
        if (one!=null){
            one.setSort(sort);
            one.setIsOpen(isOpen);
            if(ToolUtil.isNotEmpty(img)){
                one.setBackgroundImage(img);
            }
        }
        if (one == null){
            StoreConfig storeConfig = new StoreConfig();
            storeConfig.setStoreId(id);
            storeConfig.setType(type);
            storeConfig.setIsOpen(isOpen);
            storeConfig.setSort(sort);
            storeConfig.setBackgroundImage(img);
            storeConfigService.save(storeConfig);
            return storeConfig;
        }

        return one;
    }
    @RequestMapping(value = "/oneChangeNext")

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

@@ -216,7 +216,7 @@
    @RequestMapping("/list")
    @ResponseBody
    public List<Game> changelist(BallQueryDto ballQueryDto) {
System.out.println("=======ballQueryDto=========="+ballQueryDto);
        System.out.println("=======ballQueryDto=========="+ballQueryDto);
        User user = UserExt.getUser();
        ballQueryDto.setType(user.getObjectType());
        ballQueryDto.setId(user.getObjectId());

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java

@@ -83,6 +83,6 @@


    List<Map<String, Object>> listStoreAllByIds(List<Integer> ids);
    List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page);
    List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName);

}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java

@@ -30,8 +30,8 @@
    }

    @Override
    public List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page) {
        return this.baseMapper.querySiteListOfpage(provinceCode,cityCode,operatorId,storeName,page);
    public List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName) {
        return this.baseMapper.querySiteListOfpage(provinceCode,cityCode,operatorId,storeName);
    }

    /**

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

@@ -36,7 +36,9 @@

    <select id="listAll" resultType="com.dsh.guns.modular.system.model.TStoreListVo">
        select t1.*,t2.name userName,t2.phone userPhone,t3.name yysName
        from t_store t1 left join sys_user t2 on t1.storeStaffId = t2.id left  join t_operator t3 on t1.operatorId = t3.id
        from t_store t1
        left join sys_user t2 on t1.storeStaffId = t2.id
        left  join t_operator t3 on t1.operatorId = t3.id
        where 1=1
        <if test="provinceCode !=null and provinceCode !=''">
            and t1.provinceCode = #{provinceCode}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html

@@ -228,7 +228,10 @@
        console.log(res)
        if (oneId == "1"){
            res.innerHTML ="推荐像素:780x472px";
        }else{
        }else if (oneId == "6" || oneId == "7") {
            res.innerHTML ="推荐像素:宽780px，高不限制";
        }
        else{
            res.innerHTML ="推荐像素:780x440px";
        }
        console.log(oneId)

 cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html

@@ -60,6 +60,8 @@
                        <option value="2" ${data.position == 2 ? 'selected=selected' : ''}>线上课得积分</option>
                        <option value="3" ${data.position == 3 ? 'selected=selected' : ''}>看视频得奖励</option>
                        <option value="4" ${data.position == 4 ? 'selected=selected' : ''}>常见问题</option>
                        <option value="6" ${data.position == 6 ? 'selected=selected' : ''}>社区世界杯顶部banner</option>
                        <option value="7" ${data.position == 7 ? 'selected=selected' : ''}>社区世界杯底部banner</option>
                    </select>
                </div>
            </div>

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

@@ -44,9 +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}">
    @if(userType!=1){
    <input hidden id="operatorId" value="${operatorId}">
    @}
    @if(userType==3){
    <input hidden id="storeId" value="${storeId}">
    @}

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

@@ -45,9 +45,7 @@
<div class="ibox float-e-margins">
    <input hidden id="userType" value="${userType}">
    <input hidden id="id" value="${id}">
    @if(userType!=1){
    <input hidden id="operatorId" value="${operatorId}">
    @}
    @if(userType==3){
    <input hidden id="storeId" value="${storeId}">
    @}

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

@@ -24,7 +24,7 @@
        {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
        {title: '广告类型', field: 'position', visible: true, align: 'center', valign: 'middle',width:'20%',
            formatter:function (data) {
                return {1:"首页banner",2:"线上课得积分",3:"看视频得奖励",4:"常见问题"}[data]
                return {1:"首页banner",2:"线上课得积分",3:"看视频得奖励",4:"常见问题",6:"社区世界杯顶部",7:"社区世界杯底部"}[data]
            }
        },
        {title: '广告名称', field: 'name', visible: true, align: 'center', valign: 'middle'},

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

@@ -494,6 +494,9 @@
    var carPhoto = new $WebUpload("c8");
    carPhoto.setUploadBarId("progressBar");
    carPhoto.init();
    var carPhoto = new $WebUpload("c9");
    carPhoto.setUploadBarId("progressBar");
    carPhoto.init();
    var carPhoto = new $WebUpload("img");
    carPhoto.setUploadBarId("progressBar");
    carPhoto.init();

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

@@ -46,6 +46,9 @@
    let coverImg = $('#coverImg').val();
    let homeBackdropImg = $('#homeBackdropImg').val();
    let content = editor.getContent();
    if("" == registrationClosingTime){
        registrationClosingTime = null;
    }
    if(null == name || '' == name){
        Feng.error("请填写有效的比赛名称");
        return
@@ -209,6 +212,9 @@
    let coverImg = $('#coverImg').val();
    let homeBackdropImg = $('#homeBackdropImg').val();
    let content = editor.getContent();
    if("" == registrationClosingTime){
        registrationClosingTime = null;
    }
    if(null == name || '' == name){
        Feng.error("请填写有效的比赛名称");
        return
@@ -411,7 +417,7 @@

    });

    if(null != $('#id').val()){
    if(null != $('#id').val() && '' != $('#id').val()){
        WorldCupInfo.stores = JSON.parse($('#storeInfo').val());
        WorldCupInfo.initStore();
        let lng = $('#longitude').val();

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

@@ -89,25 +89,18 @@
    })
    public ResultUtil<List<TGameConfig>> queryGameList(Integer siteId, Integer storeId) {
        try {

            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("当前场地已被锁定");
                    }
                }

            }

            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();

 cloud-server-other/src/main/java/com/dsh/other/entity/Site.java

@@ -36,6 +36,8 @@
     */
    @TableField("siteTypeId")
    private Integer siteTypeId;
    @TableField("isCanBeBooked")
    private Integer isCanBeBooked;
    /**
     * 城市管理员id
     */
@@ -61,11 +63,7 @@
     */
    @TableField("cityCode")
    private String cityCode;
    /**
     * 是否可预约（0=否，1=是）
     */
    @TableField("isCanBeBooked")
    private Integer isCanBeBooked;

    /**
     * 预约开始时间
     */