From d6b28b2d38ae32c1d147e263c1cb4cff6b32a503 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 29 五月 2023 18:26:02 +0800
Subject: [PATCH] 修改bug
---
driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java | 123 ++++++++++++++++++++++++++++------------
1 files changed, 85 insertions(+), 38 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java b/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java
index ca9e7bb..1be8246 100644
--- a/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java
@@ -243,19 +243,18 @@
JSONArray chargeStandard = jsonObject.getJSONArray("ChargeStandard");
JSONObject extraCost = jsonObject.getJSONObject("ExtraCost");
Date date = new Date();
- for (int i = 0; i < chargeStandard.size(); i++) {
+
+ boolean b = true;
+ for (int i = 1; i < chargeStandard.size(); i++) {//各种时间段
JSONObject jsonObject1 = chargeStandard.getJSONObject(i);
String num1 = jsonObject1.getString("num1");
String num2 = jsonObject1.getString("num2");
- Double num3 = jsonObject1.getDouble("num3");//起步里程
- Double num4 = jsonObject1.getDouble("num4");//起步价格
- Double num5 = jsonObject1.getDouble("num5");//超过公里
- Double num6 = jsonObject1.getDouble("num6");//超过num3每num5公里收取num6
- Double num7 = jsonObject1.getDouble("num7");//长途起始公里
- Double num8 = jsonObject1.getDouble("num8");//长途结束公里
- Double num9 = jsonObject1.getDouble("num9");//长途费
- Double num10 = jsonObject1.getDouble("num10");//超出长途里程每num10公里
- Double num11 = jsonObject1.getDouble("num11");//超过num8每num10公里收取num11
+ JSONArray num3 = jsonObject1.getJSONArray("num3");//起步里程
+ Double num4 = jsonObject1.getDouble("num4");//长途里程
+ Double num5 = jsonObject1.getDouble("num5");//长途里程
+ Double num6 = jsonObject1.getDouble("num6");//长途费
+ Double num7 = jsonObject1.getDouble("num7");//超出长途里程每num10公里
+ Double num8 = jsonObject1.getDouble("num8");//超过num8每num10公里收取num11
String[] split = num1.split(":");
Calendar s = Calendar.getInstance();
@@ -272,33 +271,81 @@
e.set(Calendar.SECOND, 0);
if(date.getTime() >= s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
- if(num3.compareTo(distance) >= 0){//起步里程内
- order.setStartDistance(distance);//起步里程
- order.setStartPrice(num4);//起步价
- }else{
- BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num3));//超出起步里程
- BigDecimal divide = subtract.divide(new BigDecimal(num5), new MathContext(2, RoundingMode.HALF_EVEN));
- BigDecimal multiply = divide.multiply(new BigDecimal(num6));
- order.setStartDistance(num3);//起步里程
- order.setStartPrice(num4);//起步价
- order.setOverDriveDistance(subtract.doubleValue());//超出起步里程
- order.setOverDrivePrice(multiply.doubleValue());//超出起步里程费
-
+ b = false;
+ Double dd = 0d;
+ for (int j = 0; j < num3.size(); j++) {
+ JSONObject jsonObject2 = num3.getJSONObject(j);
+ Double num1_1 = jsonObject2.getDouble("num1");
+ Double num2_1 = jsonObject2.getDouble("num2");
+ Double num3_1 = jsonObject2.getDouble("num3");
+ if(num1_1.compareTo(distance) <= 0 && num2_1.compareTo(distance) > 0){
+ order.setStartDistance(distance);//起步里程
+ order.setStartPrice(num3_1);//起步价
+ }
+ if(j == num3.size() - 1 && order.getStartPrice() == 0){
+ order.setStartDistance(num2_1);//起步里程
+ order.setStartPrice(num3_1);//起步价
+ dd = distance - num2_1;
+ }
+ }
+ if(dd != 0){
//计算长途费
- if(distance.compareTo(num7) > 0){
- order.setLongDistance(num7 + "-" + num8);//长途里程
- order.setLongDistancePrice(num9);//长途费
+ if(distance.compareTo(num4) > 0){
+ order.setLongDistance(num4 + "-" + num5);//长途里程
+ order.setLongDistancePrice(num6);//长途费
}
//计算长途里程超出的部分
- if(distance.compareTo(num8) > 0){
- BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num8));
- BigDecimal divide1 = subtract1.divide(new BigDecimal(num10), new MathContext(2, RoundingMode.HALF_EVEN));
- BigDecimal multiply1 = divide1.multiply(new BigDecimal(num11));
+ if(distance.compareTo(num5) > 0){
+ BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num5));
+ BigDecimal divide1 = subtract1.divide(new BigDecimal(num7), new MathContext(2, RoundingMode.HALF_EVEN));
+ BigDecimal multiply1 = divide1.multiply(new BigDecimal(num8));
order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
}
}
break;
+ }
+ }
+
+ if(b){//默认配置
+ JSONObject jsonObject1 = chargeStandard.getJSONObject(0);
+ JSONArray num3 = jsonObject1.getJSONArray("num3");//起步里程
+ Double num4 = jsonObject1.getDouble("num4");//长途里程
+ Double num5 = jsonObject1.getDouble("num5");//长途里程
+ Double num6 = jsonObject1.getDouble("num6");//长途费
+ Double num7 = jsonObject1.getDouble("num7");//超出长途里程每num10公里
+ Double num8 = jsonObject1.getDouble("num8");//超过num8每num10公里收取num11
+
+ Double dd = 0d;
+ for (int j = 0; j < num3.size(); j++) {
+ JSONObject jsonObject2 = num3.getJSONObject(j);
+ Double num1_1 = jsonObject2.getDouble("num1");
+ Double num2_1 = jsonObject2.getDouble("num2");
+ Double num3_1 = jsonObject2.getDouble("num3");
+ if(num1_1.compareTo(distance) <= 0 && num2_1.compareTo(distance) > 0){
+ order.setStartDistance(distance);//起步里程
+ order.setStartPrice(num3_1);//起步价
+ }
+ if(j == num3.size() - 1 && order.getStartPrice() == 0){
+ order.setStartDistance(num2_1);//起步里程
+ order.setStartPrice(num3_1);//起步价
+ dd = distance - num2_1;
+ }
+ }
+ if(dd != 0){
+ //计算长途费
+ if(distance.compareTo(num4) > 0){
+ order.setLongDistance(num4 + "-" + num5);//长途里程
+ order.setLongDistancePrice(num6);//长途费
+ }
+ //计算长途里程超出的部分
+ if(distance.compareTo(num5) > 0){
+ BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num5));
+ BigDecimal divide1 = subtract1.divide(new BigDecimal(num7), new MathContext(2, RoundingMode.HALF_EVEN));
+ BigDecimal multiply1 = divide1.multiply(new BigDecimal(num8));
+ order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
+ order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
+ }
}
}
@@ -326,7 +373,7 @@
//恶劣天气
systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 8));
- if(null != systemConfig) {
+ if(null != systemConfig){
JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
Integer num11 = jsonObject1.getInteger("num1");//开启恶劣天气计价
if(1 == num11){
@@ -355,11 +402,6 @@
}
}
-
- //计算折扣
- if(null != order.getUserId()){
-
- }
//计算总金额
BigDecimal bigDecimal = new BigDecimal(order.getStartPrice() + order.getOverDrivePrice() + order.getLongDistancePrice() + order.getOverLongDistancePrice() +
@@ -558,7 +600,7 @@
List<HallOrderList> hallOrderLists = this.baseMapper.queryOrderHall(pageNum, pageSize);
hallOrderLists.forEach(hallOrderList -> {
if(ToolUtil.isEmpty(hallOrderList.getAvatar())){
- hallOrderList.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
+ hallOrderList.setAvatar("https://fanghuadaijia.obs.cn-southwest-2.myhuaweicloud.com:443/img%2Fc68f32a7e78e4ef1b0c018fd2c15d7a7.png");
}
hallOrderList.setCurrentDistance(0D);
if(ToolUtil.isNotEmpty(value)){
@@ -708,8 +750,10 @@
orderTransferService.insert(orderTransfer);
}
- pushUtil.pushTransferSuccessful(order.getUserId(), 1, order.getId());
pushUtil.pushTransferSuccessful(oldDriverId, 2, order.getId());
+ if(null != order.getUserId()){
+ pushUtil.pushTransferSuccessful(order.getUserId(), 1, order.getId());
+ }
}
//推动订单数据
@@ -823,6 +867,7 @@
Driver driver = driverService.selectById(order.getDriverId());
driver.setServerStatus(1);
driverService.updateById(driver);
+ accountChangeDetailService.deductionInsurance();//扣减保险费
saveIntegral(order);
break;
case 401:
@@ -1107,7 +1152,9 @@
driverService.updateById(driver);
}
- pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getStatus());
+ if(null != order.getUserId()){
+ pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getStatus());
+ }
return ResultUtil.success();
}
--
Gitblit v1.7.1