bug修改

44323

2024-03-14 d11019175718eb401dce1601592759796c6ddfe3

bug修改

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

@@ -93,7 +93,8 @@
    List<Map<String, Object>> querySiteListOfpage(@Param("provinceCode") String provinceCode,
                                                  @Param("cityCode")  String cityCode,
                                                  @Param("operatorId")  Integer operatorId,
                                                  @Param("storeName")  String storeName
                                                  @Param("storeName")  String storeName,
                                                  @Param("storeId")  Integer storeId
                                               );



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

@@ -221,11 +221,16 @@
    @RequestMapping("/siteDetailsOfSearch")
    @ResponseBody
    public Object siteDetailsOfSearch(String provinceId,String cityId,Integer operatorId,String storeName){
        Integer storeId = null;
        if (UserExt.getUser().getObjectType()== 2){
            // 筛选这个运营商下的门店
            operatorId = UserExt.getUser().getObjectId();
        }
        List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName);
        if (UserExt.getUser().getObjectType()== 3){
            // 筛选这个运营商下的门店
            storeId = UserExt.getUser().getObjectId();
        }
        List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName,storeId);
        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

@@ -250,7 +250,7 @@
                        .ne("state", 3));
            }else{
                tStores = storeService.list(new QueryWrapper<TStore>()
                        .eq("operatorId", 0)
                        .eq("operatorId", byId.getOperatorId())
                        .eq("type", 2)
                        .ne("state", 3));
            }

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

@@ -501,7 +501,19 @@
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
        pointsMerchandise.setStartTime(format.parse(startTime.split(" - ")[0]));
        pointsMerchandise.setEndTime(format.parse(startTime.split(" - ")[1]));
        pointsMerchandise.setUseScope(useScope);
        if (UserExt.getUser().getObjectType()==3){
            if (StringUtils.hasLength(sites)){
                useScope = 4;
                sites="";
                pointsMerchandise.setUseScope(4);
            }else{
                useScope = 3;
                pointsMerchandise.setUseScope(3);
            }
        }else{
            pointsMerchandise.setUseScope(useScope);

        }
        if(ToolUtil.isNotEmpty(provinceCode)){
            TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, provinceCode));
            pointsMerchandise.setProvinceCode(provinceCode);

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

@@ -85,6 +85,6 @@


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

}

 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) {
        return this.baseMapper.querySiteListOfpage(provinceCode,cityCode,operatorId,storeName);
    public List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Integer storeId) {
        return this.baseMapper.querySiteListOfpage(provinceCode,cityCode,operatorId,storeName,storeId);
    }

    /**

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

@@ -209,7 +209,9 @@
        <if test="storeName != null and storeName != ''">
            and t2.name like CONCAT('%',#{storeName},'%')
        </if>

        <if test="storeId != null">
            and t1.storeId = #{storeId}
        </if>
    </select>

    <select id="listStoreAll" resultType="map">

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

@@ -199,7 +199,7 @@
              },
              "source": {
                "method": "post",
                "url": "/coursePackage/queryStore1/$city",
                "url": "/coursePackage/queryStore1/$city/$operationId",
                "messages": {
                },
                "sendOn": "this.city != null &&this.city != ' '"

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_imgAll.html

@@ -1,17 +1,32 @@
@layout("/common/_container.html"){
<div class="ibox float-e-margins">
    <div class="ibox-content">

        <div class="form-horizontal" id="carInfoForm">
            <input hidden id="id" value="${id}">
            @if(c1!=null){
            <input hidden id="s1" value="${c1.isOpen}">
            @}
            @if(c2!=null){
            <input hidden id="s2" value="${c2.isOpen}">
            @}
            @if(c3!=null){
            <input hidden id="s3" value="${c3.isOpen}">
            @}
            @if(c4!=null){
            <input hidden id="s4" value="${c4.isOpen}">
            @}
            @if(c5!=null){
            <input hidden id="s5" value="${c5.isOpen}">
            @}
            @if(c6!=null){
            <input hidden id="s6" value="${c6.isOpen}">
            @}
            @if(c7!=null){
            <input hidden id="s7" value="${c7.isOpen}">
            @}
            @if(c8!=null){
            <input hidden id="s8" value="${c8.isOpen}">
            @}
            <input hidden id="s9" value="${worldCupStores}">
            <div class="row">
                <div class="col-lg-6" style="">
@@ -23,7 +38,12 @@
                    <div class="form-group">
                        <label class="col-sm-3 control-label">排序：</label>
                        <div class="col-sm-9">
                            @if(c1==null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px1" value="">
                            @}
                            @if(c1!=null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px1" value="${c1.sort}">
                            @}
                        </div>
                    </div>
                    @if(c1==null){
@@ -42,7 +62,12 @@
                    <div class="form-group">
                        <label class="col-sm-3 control-label">排序：</label>
                        <div class="col-sm-9">
                            @if(c2==null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px2" value="">
                            @}
                            @if(c2!=null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px2" value="${c2.sort}">
                            @}
                        </div>
                    </div>
                    @if(c2==null){
@@ -66,7 +91,12 @@
                    <div class="form-group">
                        <label class="col-sm-3 control-label">排序：</label>
                        <div class="col-sm-9">
                            @if(c3==null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px3" value="">
                            @}
                            @if(c3!=null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px3" value="${c3.sort}">
                            @}
                        </div>
                    </div>
                    @if(c3==null){
@@ -85,7 +115,12 @@
                    <div class="form-group">
                        <label class="col-sm-3 control-label">排序：</label>
                        <div class="col-sm-9">
                            @if(c4==null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px4" value="">
                            @}
                            @if(c4!=null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px4" value="${c4.sort}">
                            @}
                        </div>
                    </div>
                    @if(c4==null){
@@ -109,7 +144,12 @@
                    <div class="form-group">
                        <label class="col-sm-3 control-label">排序：</label>
                        <div class="col-sm-9">
                            @if(c5==null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px5" value="">
                            @}
                            @if(c5!=null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px5" value="${c5.sort}">
                            @}
                        </div>
                    </div>
                    @if(c5==null){
@@ -128,7 +168,12 @@
                    <div class="form-group">
                        <label class="col-sm-3 control-label">排序：</label>
                        <div class="col-sm-9">
                            @if(c6==null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px6" value="">
                            @}
                            @if(c6!=null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px6" value="${c6.sort}">
                            @}
                        </div>
                    </div>
                    @if(c6==null){
@@ -151,7 +196,12 @@
                    <div class="form-group">
                        <label class="col-sm-3 control-label">排序：</label>
                        <div class="col-sm-9">
                            @if(c7==null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px7" value="">
                            @}
                            @if(c7!=null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px7" value="${c7.sort}">
                            @}
                        </div>
                    </div>
                    @if(c7==null){
@@ -170,7 +220,12 @@
                    <div class="form-group">
                        <label class="col-sm-3 control-label">排序：</label>
                        <div class="col-sm-9">
                            @if(c8==null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px8" value="">
                            @}
                            @if(c8!=null){
                            <input class="form-control"  style="width: 200px;"  type="text" id="px8" value="${c8.sort}">
                            @}
                        </div>
                    </div>
                    @if(c8==null){

 cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html

@@ -214,6 +214,10 @@
            @}
            @if(userType!=3){
            <div class="row" id="siteSelect" hidden >
                @}
                @if(userType==3){
                <div class="row" id="siteSelect"  >
                @}
                <div class="form-group">
                    <div class="form-group">
                        <div class="col-sm-12">
@@ -239,10 +243,8 @@
                            </table>
                        </div>
                    </div>

                </div>
            </div>
            @}
            <div class="form-group" style="margin-left:262px">
                <label class="col-sm-1 control-label">兑换说明：</label>
                <div class="col-sm-5">

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

@@ -855,6 +855,10 @@
        sites = this.siteIds.join(',');
        console.log('sites--===--',sites)
    }
    if ($("#userType").val() == 3){

        sites = this.siteIds.join(',');
    }
        let text  = TGoodsInfoDlg.editor.getContent();
        console.log(text)
        if(text==""){