From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 90092a7..b54f179 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -522,16 +522,16 @@
map.put("orderId", orderPrivateCar1.getId());
orders.add(map);
}
- List<OrderTaxi> list1 = orderTaxiService.selectList(new EntityWrapper<OrderTaxi>().eq("type", 2).eq("crossCityOrderId", orderPrivateCar.getCrossCityOrderId()).eq("place", orderPrivateCar.getPlace()));
- for(OrderTaxi orderTaxi : list1){
- if(orderTaxi.getState() != 1){
- return ResultUtil.error("订单已被司机接单，推单取消");
- }
- Map<String, Integer> map = new HashMap<>();
- map.put("orderType", 2);
- map.put("orderId", orderTaxi.getId());
- orders.add(map);
- }
+// List<OrderTaxi> list1 = orderTaxiService.selectList(new EntityWrapper<OrderTaxi>().eq("type", 2).eq("crossCityOrderId", orderPrivateCar.getCrossCityOrderId()).eq("place", orderPrivateCar.getPlace()));
+// for(OrderTaxi orderTaxi : list1){
+// if(orderTaxi.getState() != 1){
+// return ResultUtil.error("订单已被司机接单，推单取消");
+// }
+// Map<String, Integer> map = new HashMap<>();
+// map.put("orderType", 2);
+// map.put("orderId", orderTaxi.getId());
+// orders.add(map);
+// }
//开始重新推单
orderCrossCityService.pushOrder(orders);
--
Gitblit v1.7.1