From 5228e24ff93fae148db40c44d9deb8e93110c6eb Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 14 二月 2025 17:16:21 +0800
Subject: [PATCH] 开发新增加功能
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
index 7339b5f..c1fb2af 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
@@ -141,7 +141,7 @@
if(3 == language){
map.put("name", map.get("frenchName"));
}
- Map<String, Object> query1 = systemPriceMapper.query(companyId, type, Integer.valueOf(map.get("id").toString()));
+ Map<String, Object> query1 = systemPriceMapper.query(companyId, type, Integer.valueOf(map.get("id").toString()), language);
if(null == query1){//排除没有设置价格的车型
continue;
}
@@ -149,6 +149,7 @@
double amount = 0;
if(type == 1 || type == 4){//专车
JSONObject jsonObject = JSON.parseObject(query1.get("content").toString());
+ String fareTypeNote = query1.get("fareTypeNote").toString();
Double num1 = jsonObject.getDouble("num1");//起步价（元）
Double num2 = jsonObject.getDouble("num2");//起步公里（公里）
Double num3 = jsonObject.getDouble("num3");//起步时间（分钟）
@@ -258,6 +259,7 @@
serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
serverCarModelWarpper.setMileage(d);
serverCarModelWarpper.setDuration(t);
+ serverCarModelWarpper.setFareTypeNote(fareTypeNote);
data.add(serverCarModelWarpper);
continue;
}
@@ -277,6 +279,7 @@
serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
serverCarModelWarpper.setMileage(d);
serverCarModelWarpper.setDuration(t);
+ serverCarModelWarpper.setFareTypeNote(fareTypeNote);
data.add(serverCarModelWarpper);
continue;
}
--
Gitblit v1.7.1