From ab9a0091e3df6dfcff5a1309cc0cd6a4f29611c7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 07 七月 2025 11:07:42 +0800
Subject: [PATCH] 跨城修改

---
 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java |   84 +++++++++++++++++++++---------------------
 UserNTTravel/guns-admin/src/main/resources/application.yml                                                            |    9 ++--
 2 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index f37de78..a7fbc7e 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -935,30 +935,30 @@
         if(Integer.valueOf(query.get("type").toString()) == 1){//固定金额
             double num1 = Double.valueOf(jsonObject.getString("num1")).doubleValue();
             double num2 = Double.valueOf(jsonObject.getString("num2")).doubleValue();
-            double num3 = Double.valueOf(jsonObject.getString("num3")).doubleValue();
-            double num4 = Double.valueOf(jsonObject.getString("num4")).doubleValue();
-            double num5 = Double.valueOf(jsonObject.getString("num5")).doubleValue();
-            double num6 = Double.valueOf(jsonObject.getString("num6")).doubleValue();
-            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 num3 = Double.valueOf(jsonObject.getString("num3")).doubleValue();
+//            double num4 = Double.valueOf(jsonObject.getString("num4")).doubleValue();
+//            double num5 = Double.valueOf(jsonObject.getString("num5")).doubleValue();
+//            double num6 = Double.valueOf(jsonObject.getString("num6")).doubleValue();
+//            double num7 = Double.valueOf(jsonObject.getString("num7")).doubleValue();
+//            double num8 = Double.valueOf(jsonObject.getString("num8")).doubleValue();
+//            double num9 = Double.valueOf(jsonObject.getString("num9")).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("16"))|| (totalSeat == 28 && s.equals("26"))
-                            || (totalSeat == 31 && s.equals("29"))|| (totalSeat == 35 && s.equals("33"))
-                            || (totalSeat == 53 && s.equals("51"))){
-                        b = true;
-                        break;
-                    }
-                }
+//                boolean b = false;
+//                for(String s : split){
+//                    if((totalSeat == 4 && s.equals("3")) || (totalSeat == 6 && s.equals("5"))
+//                            || (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 == 31 ? num7 : totalSeat == 35 ? num8 : num9);
-                    peopleNumber -= 1;
-                }
+//                if(b){
+//                    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;
                 map.put("price", new BigDecimal(price).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
             }else{
@@ -972,31 +972,31 @@
             double num3 = Double.valueOf(jsonObject.getString("num3")).doubleValue();//基础单价
             double num4 = Double.valueOf(jsonObject.getString("num4")).doubleValue();//优惠系数
             double num5 = Double.valueOf(jsonObject.getString("num5")).doubleValue();//包车系数
-            double num6 = Double.valueOf(jsonObject.getString("num6")).doubleValue();//五座系数
-            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 num12 = Double.valueOf(jsonObject.getString("num12")).doubleValue();//五十四座系数
+//            double num6 = Double.valueOf(jsonObject.getString("num6")).doubleValue();//五座系数
+//            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 num12 = Double.valueOf(jsonObject.getString("num12")).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("16"))|| (totalSeat == 28 && s.equals("26"))
-                            || (totalSeat == 31 && s.equals("29"))|| (totalSeat == 35 && s.equals("33"))
-                            || (totalSeat == 53 && s.equals("51"))){
-                        b = true;
-                        break;
-                    }
-                }
+//                boolean b = false;
+//                for(String s : split){
+//                    if((totalSeat == 4 && s.equals("3")) || (totalSeat == 6 && s.equals("5"))
+//                            || (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 == 31 ? num10 : totalSeat == 35 ? num11 : num12);
-                    peopleNumber -= 1;
-                }
+//                if(b){
+//                    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;
                 map.put("price", new BigDecimal(price).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
             }else{
diff --git a/UserNTTravel/guns-admin/src/main/resources/application.yml b/UserNTTravel/guns-admin/src/main/resources/application.yml
index 9f927f4..15c0601 100644
--- a/UserNTTravel/guns-admin/src/main/resources/application.yml
+++ b/UserNTTravel/guns-admin/src/main/resources/application.yml
@@ -58,13 +58,14 @@
     url: jdbc:mysql://127.0.0.1:10633/hqtravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
     username: root
     password: HuanQiu@2025!
-    db-name: guns #用来搜集数据库的所有表
-    filters: wall,mergeStat
 #    url: jdbc:mysql://1.95.90.13:10633/hqtravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
 #    username: huanqiu
 #    password: HuanQiu@2024!
-#    db-name: guns #用来搜集数据库的所有表
-#    filters: wall,mergeStat
+#    url: jdbc:mysql://127.0.0.1:3306/hqtravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+#    username: root
+#    password: 123456
+    db-name: guns #用来搜集数据库的所有表
+    filters: wall,mergeStat
 
 #多数据源情况的配置
 guns:

--
Gitblit v1.7.1