yanderong
2026-07-09 c9811a83d7c2805288557d3c2a9e4834f2c8c6ee
feat: 城市查询but
1个文件已修改
27 ■■■■■ 已修改文件
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -247,6 +247,14 @@
    public ResultUtil queryNeedCertificate(String code){
        try {
            Integer integer = driverService.queryNeedCertificate(code);
            if(Objects.isNull(integer)) {
                String cityCode = code.substring(0, code.length() - 2) + "00";
                integer = driverService.queryNeedCertificate(cityCode);
            }
            if(Objects.isNull(integer)) {
                String provinceCode = code.substring(0, code.length() - 4) + "0000";
                integer = driverService.queryNeedCertificate(provinceCode);
            }
            return ResultUtil.success(integer == null ? 0 : integer);
        }catch (Exception e){
            e.printStackTrace();
@@ -1866,17 +1874,22 @@
        try {
            ArrayList<CompanyVo> companyVos = new ArrayList<>();
            List<CompanyCity> companyCities = companyCityService.selectList(new EntityWrapper<CompanyCity>().eq("areaCode", areaCode).eq("state", 1));
            if(companyCities.isEmpty()) {
            List<CompanyCity> companyCities = new ArrayList<>();
            List<CompanyCity> companyCities1 = companyCityService.selectList(new EntityWrapper<CompanyCity>().eq("areaCode", areaCode).eq("state", 1));
                // 最后两位替换为0
                String cityCode = areaCode.substring(0, areaCode.length() - 2) + "00";
                companyCities = companyCityService.selectList(new EntityWrapper<CompanyCity>().eq("cityCode", cityCode).eq("state", 1));
            }
            if(CollectionUtils.isEmpty(companyCities)) {
            List<CompanyCity> companyCities2 = companyCityService.selectList(new EntityWrapper<CompanyCity>().eq("cityCode", cityCode).eq("state", 1));
                // 最后四位替换为0
                String provinceCode = areaCode.substring(0, areaCode.length() - 4) + "0000";
                companyCities = companyCityService.selectList(new EntityWrapper<CompanyCity>().eq("provinceCode", provinceCode).eq("state", 1));
            List<CompanyCity> companyCities3 = companyCityService.selectList(new EntityWrapper<CompanyCity>().eq("provinceCode", provinceCode).eq("state", 1));
            if(CollectionUtils.isNotEmpty(companyCities1)) {
                companyCities.addAll(companyCities1);
            }
            if(CollectionUtils.isNotEmpty(companyCities2)) {
                companyCities.addAll(companyCities2);
            }
            if(CollectionUtils.isNotEmpty(companyCities3)) {
                companyCities.addAll(companyCities3);
            }
            if(CollectionUtils.isEmpty(companyCities)) {
                return ResultUtil.success(companyVos);