From 831e3312572cf29dd91cbd882ef3dce809ac852d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 14 六月 2023 20:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/SystemConfigServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/SystemConfigServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/SystemConfigServiceImpl.java
index 17eed7b..6bcab9e 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/SystemConfigServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/SystemConfigServiceImpl.java
@@ -85,7 +85,12 @@
Map<String, Object> map = new HashMap<>();
map.put("waitTime", num1 + "分钟/" + num2 + "元");
map.put("exceedWaitTime", "超出" + num3 + "分钟，收取" + num4 + "元/分钟");
- map.put("badWeather", "雨天、恶劣天气时代驾里程在" + num5 + "公里内加" + num6 + "元/单，达" + num7 + "公里或以上的订单按总价加" + num8 + "倍计费，封顶加" + num9 + "元");
+ systemConfig = this.selectOne(new EntityWrapper<SystemConfig>().eq("type", 8));
+ JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
+ Integer num11 = jsonObject1.getInteger("num1");//开启恶劣天气计价
+ if(1 == num11){
+ map.put("badWeather", "雨天、恶劣天气时代驾里程在" + num5 + "公里内加" + num6 + "元/单，达" + num7 + "公里或以上的订单按总价加" + num8 + "倍计费，封顶加" + num9 + "元");
+ }
priceRulesWarpper.setAdditionalFee(JSON.toJSONString(map));
}
return priceRulesWarpper;
--
Gitblit v1.7.1