From 6ce9827308268ea3922b87339375b14de85788d6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 18 六月 2025 17:46:08 +0800
Subject: [PATCH] 跨城修改座位
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index dc900b8..df0e9fd 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -847,22 +847,21 @@
double num7 = Double.valueOf(jsonObject.getString("num7")).doubleValue();
double num8 = Double.valueOf(jsonObject.getString("num8")).doubleValue();
double num9 = Double.valueOf(jsonObject.getString("num9")).doubleValue();
- double num10 = Double.valueOf(jsonObject.getString("num10")).doubleValue();
if(travelMode == 1){//拼车
String[] split = seatNumber.split(",");
boolean b = false;
for(String s : split){
if((totalSeat == 4 && s.equals("3")) || (totalSeat == 6 && s.equals("5"))
- || (totalSeat == 18 && s.equals("7"))|| (totalSeat == 28 && s.equals("7"))
- || (totalSeat == 35 && s.equals("7"))|| (totalSeat == 37 && s.equals("7"))
- || (totalSeat == 53 && s.equals("7"))|| (totalSeat == 55 && s.equals("7"))){
+ || (totalSeat == 18 && s.equals("16"))|| (totalSeat == 28 && s.equals("26"))
+ || (totalSeat == 31 && s.equals("29"))|| (totalSeat == 35 && s.equals("33"))
+ || (totalSeat == 53 && s.equals("51"))){
b = true;
break;
}
}
double price1 = 0D;
if(b){
- price1 = num1 * (totalSeat == 4 ? num3 : totalSeat == 6 ? num4 : totalSeat == 18 ? num5 : totalSeat == 28 ? num6 : totalSeat == 35 ? num7 : totalSeat == 37 ? num8 : totalSeat == 53 ? num9 : num10);
+ price1 = num1 * (totalSeat == 4 ? num3 : totalSeat == 6 ? num4 : totalSeat == 18 ? num5 : totalSeat == 28 ? num6 : totalSeat == 31 ? num7 : totalSeat == 35 ? num8 : num9);
peopleNumber -= 1;
}
double price = (num1 * peopleNumber) + price1;
@@ -882,26 +881,25 @@
double num7 = Double.valueOf(jsonObject.getString("num7")).doubleValue();//七座系数
double num8 = Double.valueOf(jsonObject.getString("num8")).doubleValue();//十九座系数
double num9 = Double.valueOf(jsonObject.getString("num9")).doubleValue();//二十九座系数
- double num10 = Double.valueOf(jsonObject.getString("num10")).doubleValue();//三十六座系数
- double num11 = Double.valueOf(jsonObject.getString("num11")).doubleValue();//三十八座系数
+ double num10 = Double.valueOf(jsonObject.getString("num10")).doubleValue();//三十二座系数
+ double num11 = Double.valueOf(jsonObject.getString("num11")).doubleValue();//三十六座系数
double num12 = Double.valueOf(jsonObject.getString("num12")).doubleValue();//五十四座系数
- double num13 = Double.valueOf(jsonObject.getString("num13")).doubleValue();//五十六座系数
if(travelMode == 1){//拼车
double unitPrice = (distance1 * num3 * (num1 / (num2 * num3))) + ((distance1 - num2) * num3 * num4);
String[] split = seatNumber.split(",");
boolean b = false;
for(String s : split){
if((totalSeat == 4 && s.equals("3")) || (totalSeat == 6 && s.equals("5"))
- || (totalSeat == 18 && s.equals("7"))|| (totalSeat == 28 && s.equals("7"))
- || (totalSeat == 35 && s.equals("7"))|| (totalSeat == 37 && s.equals("7"))
- || (totalSeat == 53 && s.equals("7"))|| (totalSeat == 55 && s.equals("7"))){
+ || (totalSeat == 18 && s.equals("16"))|| (totalSeat == 28 && s.equals("26"))
+ || (totalSeat == 31 && s.equals("29"))|| (totalSeat == 35 && s.equals("33"))
+ || (totalSeat == 53 && s.equals("51"))){
b = true;
break;
}
}
double price1 = 0D;
if(b){
- price1 = unitPrice * (totalSeat == 4 ? num6 : totalSeat == 6 ? num7 : totalSeat == 18 ? num8 : totalSeat == 28 ? num9 : totalSeat == 35 ? num10 : totalSeat == 37 ? num11 : totalSeat == 53 ? num12 : num13);
+ price1 = unitPrice * (totalSeat == 4 ? num6 : totalSeat == 6 ? num7 : totalSeat == 18 ? num8 : totalSeat == 28 ? num9 : totalSeat == 31 ? num10 : totalSeat == 35 ? num11 : num12);
peopleNumber -= 1;
}
double price = (unitPrice * peopleNumber) + price1;
--
Gitblit v1.7.1