修改bug

Pu Zhibing

13 小时以前 574cd41b6e4aa65426c7597297aa94f6259d6666

 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);
@@ -1512,7 +1516,7 @@
         return ResultUtil.error("取消订单失败，订单信息有误", "");
      }
      if (orderCrossCity.getState() != 12) {
         return ResultUtil.error("取消订单失败，不合法的操作", "");
         return ResultUtil.error("订单已取消，请刷新页面", "");
      }
      OrderCancel orderCancel = null;
      if (null == cancleId) {
@@ -1974,7 +1978,7 @@
         return ResultUtil.error("取消订单失败，订单信息有误");
      }
      if (orderCrossCity.getState() >= 5 && orderCrossCity.getState() != 7 && orderCrossCity.getState() != 11) {
         return ResultUtil.error("取消订单失败，不合法的操作");
         return ResultUtil.error("订单已取消，请刷新页面");
      }
      
      //还原座位
@@ -2455,6 +2459,14 @@
                        if (state != 1) {
                           //关闭其他推送线程
                           Set<String> keySet = threadMap.keySet();
                           datas.forEach(e->{
                              threadMap.get(orderId + "_1");


                           });



                           for (String key : keySet) {
                              if (!key.equals(orderId + "_1")) {
                                 Thread thread1 = threadMap.get(key);//中断线程
@@ -2468,7 +2480,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 +2553,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 +2580,6 @@
                              if (bo) {
                                 continue;
                              }
										
										
                              pushUtil.pushOrderState(2, driver.getId(), orderTaxi.getId(), 2, orderTaxi.getState(), pushOrder.getPushTime());
                           }
                        }