From 57ace2e2e90f36ba2df2465f0b1b6b1b9e931e88 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 09 七月 2025 15:20:05 +0800
Subject: [PATCH] 跨城修改座位

---
 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java |   54 +++++++++++++++++++++++++++---------------------------
 1 files changed, 27 insertions(+), 27 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 ccb1d8f..46a89c3 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
@@ -477,34 +477,34 @@
             lineShiftDriver.setLaveSeatNumber("");
         }else{//拼车
             lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() - orderCrossCity.getPeopleNumber());
-            String[] split = orderCrossCity.getSeatNumber().split(",");
-            String[] split1 = lineShiftDriver.getLaveSeatNumber().split(",");
+//            String[] split = orderCrossCity.getSeatNumber().split(",");
+//            String[] split1 = lineShiftDriver.getLaveSeatNumber().split(",");
             String seatNumber = "";
             //先判断选中座位号和剩余座位号是否匹配
-            for(String spl : split){
-                boolean b = true;
-                for(String sp : split1){
-                    if(ToolUtil.isNotEmpty(spl) && ToolUtil.isNotEmpty(sp) && sp.equals(spl)){
-                        b = false;
-                        break;
-                    }
-                }
-                if(b){
-                    throw new SystemException("您选中的" + spl + "号座位已被占用,请选择其他座位!");
-                }
-            }
-            for(String sp : split1){
-                boolean b = true;
-                for(String spl : split){
-                    if(ToolUtil.isNotEmpty(spl) && ToolUtil.isNotEmpty(sp) && sp.equals(spl)){
-                        b = false;
-                        break;
-                    }
-                }
-                if(b && ToolUtil.isNotEmpty(sp)){
-                    seatNumber += (sp + ",");
-                }
-            }
+//            for(String spl : split){
+//                boolean b = true;
+//                for(String sp : split1){
+//                    if(ToolUtil.isNotEmpty(spl) && ToolUtil.isNotEmpty(sp) && sp.equals(spl)){
+//                        b = false;
+//                        break;
+//                    }
+//                }
+//                if(b){
+//                    throw new SystemException("您选中的" + spl + "号座位已被占用,请选择其他座位!");
+//                }
+//            }
+//            for(String sp : split1){
+//                boolean b = true;
+//                for(String spl : split){
+//                    if(ToolUtil.isNotEmpty(spl) && ToolUtil.isNotEmpty(sp) && sp.equals(spl)){
+//                        b = false;
+//                        break;
+//                    }
+//                }
+//                if(b && ToolUtil.isNotEmpty(sp)){
+//                    seatNumber += (sp + ",");
+//                }
+//            }
             lineShiftDriver.setLaveSeatNumber(ToolUtil.isNotEmpty(seatNumber) ? seatNumber.substring(0, seatNumber.length() - 1) : "");
         }
         lineShiftDriverMapper.updateById(lineShiftDriver);
@@ -848,7 +848,7 @@
 //            double num8 = Double.valueOf(jsonObject.getString("num8")).doubleValue();
 //            double num9 = Double.valueOf(jsonObject.getString("num9")).doubleValue();
             if(travelMode == 1){//拼车
-                String[] split = seatNumber.split(",");
+//                String[] split = seatNumber.split(",");
 //                boolean b = false;
 //                for(String s : split){
 //                    if((totalSeat == 4 && s.equals("3")) || (totalSeat == 6 && s.equals("5"))

--
Gitblit v1.7.1