“mitao”
2026-01-23 48b3b3ccb77af09f26c442a5adce27df8bc7f2b2
feat:通过区code获取服务商接口增加供应商服务模式
2个文件已修改
31 ■■■■■ 已修改文件
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/CompanyVo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -1609,14 +1609,17 @@
            if(companyCities.isEmpty()){
                return ResultUtil.success(companyVos);
            }
            Wrapper<Company> in = new EntityWrapper<Company>().eq("type", 2).ne("flag", 3).in("id", companyCities.stream().map(CompanyCity::getCompanyId).collect(Collectors.toList()));
            Wrapper<Company> in = new EntityWrapper<Company>().ne("type", 1).ne("flag", 3).in("id", companyCities.stream().map(CompanyCity::getCompanyId).collect(Collectors.toList()));
            if(ToolUtil.isNotEmpty( name)){
                in.like("name", name);
            }
            List<Company> companies = companyService.selectList(in);
            for (Company company : companies) {
                CompanyVo companyVo = new CompanyVo(company.getId(), company.getName());
                CompanyVo companyVo = new CompanyVo();
                companyVo.setCompanyId(company.getId());
                companyVo.setCompanyName(company.getName());
                companyVo.setServiceMode(getCompanyServiceMode(company));
                companyVos.add(companyVo);
            }
            return ResultUtil.success(companyVos);
@@ -1626,6 +1629,27 @@
        }
    }
    private static String getCompanyServiceMode(Company company) {
        if (Objects.isNull(company)) {
            return null;
        }
        List<String> modes = new ArrayList<>();
        // 1=专车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车,7=95128电召
        if (Integer.valueOf(1).equals(company.getIsSpe())) {
            modes.add("1");
        }
        if (Integer.valueOf(1).equals(company.getIsTaxi())) {
            modes.add("2");
        }
        if (Integer.valueOf(1).equals(company.getIsCross())) {
            modes.add("3");
        }
        return modes.isEmpty() ? null : String.join(",", modes);
    }
    /**
     * 设置提现密码
     * @param withdrawPassword
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/CompanyVo.java
@@ -14,4 +14,7 @@
    @ApiModelProperty(value = "公司名称")
    private String companyName;
    @ApiModelProperty(value = "服务模式,多个使用逗号分隔")
    private String serviceMode;
}