From d1e1d0098fdbbf092a98332d30eb720926cd1823 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 30 四月 2025 15:14:50 +0800
Subject: [PATCH] 修改bug
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index d9ece58..c0ff11a 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -813,15 +813,19 @@
Driver driver = driverService.selectById(orderTaxi.getDriverId());
Integer companyId = driver.getCompanyId();
List<CompanyCity> companyCityList = companyCityService.selectList(new EntityWrapper<CompanyCity>().eq("companyId", companyId));
- List<Map<String, Integer>> cityCode = new ArrayList<>();
+ List<Map<String, Object>> cityCode = new ArrayList<>();
+ List<Region> regions = regionMapper.selectList(null);
for (CompanyCity companyCity : companyCityList) {
- Map<String, Integer> city = new HashMap<>();
+ Map<String, Object> city = new HashMap<>();
if(ToolUtil.isNotEmpty(companyCity.getAreaCode())){
city.put("code", Integer.valueOf(companyCity.getAreaCode()));
+ city.put("name", regions.stream().filter(s->s.getCode().equals(companyCity.getAreaCode())).findFirst().get().getName());
}else if(ToolUtil.isEmpty(companyCity.getAreaCode()) && ToolUtil.isNotEmpty(companyCity.getCityCode())){
city.put("code", Integer.valueOf(companyCity.getCityCode()));
+ city.put("name", regions.stream().filter(s->s.getCode().equals(companyCity.getCityCode())).findFirst().get().getName());
}else if(ToolUtil.isEmpty(companyCity.getCityCode()) && ToolUtil.isNotEmpty(companyCity.getProvinceCode())){
city.put("code", Integer.valueOf(companyCity.getProvinceCode()));
+ city.put("name", regions.stream().filter(s->s.getCode().equals(companyCity.getProvinceCode())).findFirst().get().getName());
}
cityCode.add(city);
}
@@ -845,15 +849,19 @@
Driver driver = driverService.selectById(orderTaxi.getDriverId());
Integer companyId = driver.getCompanyId();
List<CompanyCity> companyCityList = companyCityService.selectList(new EntityWrapper<CompanyCity>().eq("companyId", companyId));
- List<Map<String, Integer>> cityCode = new ArrayList<>();
+ List<Map<String, Object>> cityCode = new ArrayList<>();
+ List<Region> regions = regionMapper.selectList(null);
for (CompanyCity companyCity : companyCityList) {
- Map<String, Integer> city = new HashMap<>();
+ Map<String, Object> city = new HashMap<>();
if(ToolUtil.isNotEmpty(companyCity.getAreaCode())){
city.put("code", Integer.valueOf(companyCity.getAreaCode()));
+ city.put("name", regions.stream().filter(s->s.getCode().equals(companyCity.getAreaCode())).findFirst().get().getName());
}else if(ToolUtil.isEmpty(companyCity.getAreaCode()) && ToolUtil.isNotEmpty(companyCity.getCityCode())){
city.put("code", Integer.valueOf(companyCity.getCityCode()));
+ city.put("name", regions.stream().filter(s->s.getCode().equals(companyCity.getCityCode())).findFirst().get().getName());
}else if(ToolUtil.isEmpty(companyCity.getCityCode()) && ToolUtil.isNotEmpty(companyCity.getProvinceCode())){
city.put("code", Integer.valueOf(companyCity.getProvinceCode()));
+ city.put("name", regions.stream().filter(s->s.getCode().equals(companyCity.getProvinceCode())).findFirst().get().getName());
}
cityCode.add(city);
}
--
Gitblit v1.7.1