From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
index 03f0c2a..d6b8834 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
@@ -97,7 +97,9 @@
first = baseWarppers.stream().filter(s->s.getId() == 2).findFirst();
if(first.isPresent()){
serverCarModelWarpper = this.getTextPrice(query.getId(), distance1_, duration_, 0, 2, geocode);
- price.add(serverCarModelWarpper);
+ if(serverCarModelWarpper!=null){
+ price.add(serverCarModelWarpper);
+ }
}
return ResultUtil.success(price);
}
@@ -132,10 +134,12 @@
String districtCode = geocode.get("districtCode");
//获取匹配的城市价格配置
SystemPriceCity systemPriceCity = systemPriceCityService.queryOne(provinceCode, cityCode, districtCode);
+ System.err.println("获取匹配的城市价格配置：" + systemPriceCity);
if (null == systemPriceCity) {
return new ArrayList<>();
}
List<Map<String, Object>> list = serverCarModelMapper.queryServerCarModel(type);
+ System.err.println("获取匹配的城市价格配置111：" + list);
List<ServerCarModelWarpper> data = new ArrayList<>();
for (Map<String, Object> map : list) {
Map<String, Object> query1 = systemPriceMapper.query(companyId, type, Integer.valueOf(map.get("id").toString()), systemPriceCity.getId());
--
Gitblit v1.7.1