8.18

liujie

2025-08-18 9e91ae67150c35278b69457e5a9b839851af0890

 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -153,7 +153,6 @@
    }



    /**
     * 获取司机端首页订单列表
     * @param state     1=服务中，2=待服务（30分钟定义预约）
@@ -215,7 +214,6 @@
    }



    /**
     * 走订单流程操作
     * @param orderId
@@ -257,12 +255,14 @@

                //还原座位数
                LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId());
                if (lineShiftDriver != null) {
                lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber());
                lineShiftDriver.setLaveSeatNumber(
                        (ToolUtil.isNotEmpty(lineShiftDriver.getLaveSeatNumber()) ? lineShiftDriver.getLaveSeatNumber() + ","  : "") +
                                orderCrossCity.getSeatNumber()
                );
                lineShiftDriverMapper.updateById(lineShiftDriver);
                }

                //修改司机空闲状态
                List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryWithin30Minutes(orderCrossCity.getDriverId(), 2, 3, 4, 5, 11);
@@ -371,9 +371,6 @@
        }

    }





    /**
@@ -645,8 +642,6 @@
    }




    /**
     * 计算支付金额
     * @param startLonLat
@@ -667,8 +662,6 @@
        }
        return ResultUtil.error("计算行程距离出错啦！");
    }




    /**
@@ -719,7 +712,6 @@
        this.updateAllColumnById(orderCrossCity);
        return resultUtil;
    }



    /**
@@ -949,8 +941,6 @@
    }




    /**
     * 获取订单编号
     * @return
@@ -1010,7 +1000,6 @@
//                return ResultUtil.error("司机车辆没有剩余空位了");
//            }
//        }



        orderCrossCity.setDriverId(uid);