From 48b3b3ccb77af09f26c442a5adce27df8bc7f2b2 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 23 一月 2026 18:11:47 +0800
Subject: [PATCH] feat:通过区code获取服务商接口增加供应商服务模式

---
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index 0e9dffc..a63fd94 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/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

--
Gitblit v1.7.1