修改客户反馈的bug

44323

2024-01-29 125a6f192ed7e611739f8648cf036360f600c41b

修改客户反馈的bug

 guns-admin/src/main/java/com/stylefeng/guns/modular/api/FileController.java

@@ -49,7 +49,10 @@
            PutObjectResult putObjectResult = ossClient.putObject(putObjectRequest);
            // 关闭 OSSClient 实例
            ossClient.shutdown();
            String fileUrl = "https://" + bucketName + "." + endpoint + "/" + String.valueOf(l)+"."+originalFilename.substring(originalFilename.lastIndexOf(".")+ 1);
            String fileUrl = "https://" + bucketName + "." +
                    endpoint + "/"
                    + String.valueOf(l)
                    +"."+originalFilename.substring(originalFilename.lastIndexOf(".")+ 1);
            return fileUrl;
    }


 guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HouseResourceMapper.xml

@@ -17,7 +17,7 @@
        hr.latitude,
        hr.platform,
        hr.sale_amount as saleAmount,
        IFNULL(su.`name`,au.nickname) as nickname,
        IFNULL(au.nickname,su.`name`) as nickname,
         IFNULL(au.profile_photo,su.avatar) as profilePhoto,
        au.profile_photo as profilePhoto,
        hr.drying_area as dryingArea,
@@ -28,7 +28,8 @@
        hr.is_manage as isManage,
        hr.leaseTime,
        tp.name as houseTypeName,
        hr.keep_pet as keepPet
        hr.keep_pet as keepPet,
        hr.insert_time as insertTime
        from t_house_resource hr
        left join t_app_user au on (hr.app_user_id = au.id)
        LEFT JOIN sys_user su ON hr.insert_user_id = su.id AND hr.is_manage = 1
@@ -241,7 +242,7 @@
        <if test="null != req.dataType and req.dataType == 2">
            and now() &lt;= DATE_ADD(hr.insert_time,INTERVAL 21 day)
        </if>
        order by au.user_type desc
        order by au.user_type desc,hr.insert_time desc
        <if test="null != req.sort and req.sort == 1">
            ,hr.insert_time desc
        </if>

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java

@@ -186,8 +186,10 @@
        SearchHouseResourceRes searchHouseResource = new SearchHouseResourceRes();
        List<SearchHouseResourceListRes> searchHouseResourceListRes = this.baseMapper.searchHouseResource(req, cityIds, districtIds, saleAmountStart, saleAmountEnd, houseModels, houseTypeIds);


        // 如果有根据用户历史来搜索必看 如果没有搜索出数据 那么查询所有必看
        if (req.getDataType()!=null&&req.getDataType()==1 && (!StringUtils.hasLength(req.getDistrict())) && searchHouseResourceListRes!=null&&searchHouseResourceListRes.size()==0){
        if (req.getDataType()!=null&&req.getDataType()==1 && (!StringUtils.hasLength(req.getDistrict()))
                && searchHouseResourceListRes!=null&&searchHouseResourceListRes.size()==0){
            cityIds=null;
            districtIds=null;
            searchHouseResourceListRes = this.baseMapper.searchHouseResource(req, cityIds, districtIds, saleAmountStart, saleAmountEnd, houseModels, houseTypeIds);
@@ -198,6 +200,22 @@
                t.setHouseResource(3);
            }
        }
        if (req.getUserType()==5){
            // 中介房源
            List<SearchHouseResourceListRes> collect = searchHouseResourceListRes.stream()
                    .filter(t -> t.getHouseResource() == 3)
                    .sorted(Comparator.comparing(SearchHouseResourceListRes::getInsertTime).reversed())
                    .collect(Collectors.toList());

            // 个人房源
            List<SearchHouseResourceListRes> collect1 = searchHouseResourceListRes.stream()
                    .filter(t -> t.getHouseResource() == 2)
                    .sorted(Comparator.comparing(SearchHouseResourceListRes::getInsertTime).reversed())
                    .collect(Collectors.toList());
            searchHouseResourceListRes = collect;
            searchHouseResourceListRes.addAll(collect1);
        }

        searchHouseResource.setList(searchHouseResourceListRes);
        List<SearchHouseResourceListRes> searchHouseResourceListRes1 = this.baseMapper.searchHouseResource1(req, cityIds, districtIds, saleAmountStart, saleAmountEnd, houseModels, houseTypeIds);
        searchHouseResource.setTotal(searchHouseResourceListRes1.size());

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HousingDemandServiceImpl.java

@@ -117,7 +117,7 @@
                String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=" + accessToken;
                Map<String, Object> param = new HashMap<>();
                param.put("scene","id="+housingDemand.getId());
                param.put("page", "pageA/houseDetail");
                param.put("page", "pageA/housingDetails");
                param.put("check_path", false);
                param.put("env_version", "trial");
                param.put("width", 200); //二维码尺寸

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/res/SearchHouseResourceListRes.java

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @author zhibing.pu
 * @Date 2023/11/13 11:42
@@ -57,4 +59,6 @@
    private String leaseTime;
    @ApiModelProperty("是否为平台添加")
    private Integer isManage;
    @ApiModelProperty("添加时间")
    private Date insertTime;
}