| | |
| | | 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); |
| | | |