From dc3cfaa745eb7303e312ce7ba61a7019e5f12e4b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 00:22:42 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index f85e29d..f55402a 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1263,7 +1263,6 @@
orderCrossCity.setPassengers(userInfo.getNickName());
orderCrossCity.setPassengersPhone(userInfo.getPhone());
orderCrossCity.setPeopleNumber(orderCrossCityWarpper.getPeopleNumber());
- orderCrossCity.setSeatNumber(orderCrossCityWarpper.getSeatNumber());
List<OrderCrossCity> orderCrossCities = this.selectList(new EntityWrapper<OrderCrossCity>().eq("orderNum", orderCrossCity.getOrderNum()).eq("isDelete", 1));
orderCrossCity.setSort(orderCrossCities.size() + 1);
orderCrossCity.setState(7);//待支付
@@ -1275,6 +1274,11 @@
orderCrossCity.setIsDelete(1);
orderCrossCity.setRemark(orderCrossCityWarpper.getRemark());
orderCrossCity.setIsReassign(1);
+ if(1 == orderCrossCity.getTravelMode()){
+ orderCrossCity.setSeatNumber(orderCrossCityWarpper.getSeatNumber());
+ }else{
+ orderCrossCity.setSeatNumber(lineShiftDriver.getLaveSeatNumber());
+ }
// //调用高德创建轨迹
// String s = gdFalconUtil.selectTerminal(driver.getPhone());
// String track = gdFalconUtil.createTrack(s);
@@ -2468,7 +2472,7 @@
for (Map<String, Integer> map : datas) {
Integer orderType = map.get("orderType");
Integer orderId = map.get("orderId");
- if (orderType == 1 && orderId != orderPrivateCar.getId()) {
+ if (orderType == 1 && !orderId.equals(orderPrivateCar.getId())) {
orderPrivateCarMapper.deleteById(orderId);
}
if (orderType == 2) {
@@ -2541,7 +2545,7 @@
if (orderType == 1) {
orderPrivateCarMapper.deleteById(orderId);
}
- if (orderType == 2 && orderId != orderTaxi.getId()) {
+ if (orderType == 2 && !orderId.equals(orderTaxi.getId())) {
orderTaxiMapper.deleteById(orderId);
}
}
@@ -2568,8 +2572,6 @@
if (bo) {
continue;
}
-
-
pushUtil.pushOrderState(2, driver.getId(), orderTaxi.getId(), 2, orderTaxi.getState(), pushOrder.getPushTime());
}
}
--
Gitblit v1.7.1