From 7e0384601e24ff67a8f5ea9bfdf692a64a1064d3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 八月 2025 20:47:32 +0800
Subject: [PATCH] 是否包车
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java | 8 +++++++-
1 files changed, 7 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..04a97d7 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);
}
@@ -127,15 +129,19 @@
* @throws Exception
*/
public List<ServerCarModelWarpper> getPrice(Integer companyId, double distance, long duration, long wait, Integer type, Map<String, String> geocode) throws Exception {
+ System.err.println("预估里程：" + distance);
+ System.err.println("预估时间：" + duration);
String provinceCode = geocode.get("provinceCode");
String cityCode = geocode.get("cityCode");
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