修改bug

Pu Zhibing

19 小时以前 f72ae151cc12b219cb5f39eea3ec0ea089a6ef2a

 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);
@@ -1445,7 +1449,12 @@
        if(map.get("abnormalIntro")!=null){
            map.put("appealStatus", 1);
        }
        
        if(map.get("travelMode")!=null &&map.get("travelMode").toString().equals("2") ){
            map.put("zwNum", 1);
        }else {
         map.put("zwNum", 2);
      }

      Map<String, String> geocode = gdMapGeocodingUtil.geocode(map.get("startLon").toString(), map.get("startLat").toString());
      map.put("startCity", geocode.get("city"));
      geocode = gdMapGeocodingUtil.geocode(map.get("endLon").toString(), map.get("endLat").toString());
@@ -1470,6 +1479,15 @@
      BaseWarpper baseWarpper = new BaseWarpper();
      if (null == orderCrossCity) {
         return ResultUtil.error("获取数据失败，订单信息有误");
      }
      if (orderCrossCity.getState() == 5) {
         return ResultUtil.error("订单已开始服务，不能取消订单");
      }
      if (orderCrossCity.getState() == 6 || orderCrossCity.getState() == 8 || orderCrossCity.getState() == 9) {
         return ResultUtil.error("订单已完成，不能取消订单");
      }
      if (orderCrossCity.getState() == 10) {
         return ResultUtil.error("订单已被取消，不能重复操作");
      }
      OpenCity openCity = openCityService.openCity1(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
      double amount = 0;
@@ -1507,7 +1525,7 @@
         return ResultUtil.error("取消订单失败，订单信息有误", "");
      }
      if (orderCrossCity.getState() != 12) {
         return ResultUtil.error("取消订单失败，不合法的操作", "");
         return ResultUtil.error("订单已取消，请刷新页面", "");
      }
      OrderCancel orderCancel = null;
      if (null == cancleId) {
@@ -1969,7 +1987,7 @@
         return ResultUtil.error("取消订单失败，订单信息有误");
      }
      if (orderCrossCity.getState() >= 5 && orderCrossCity.getState() != 7 && orderCrossCity.getState() != 11) {
         return ResultUtil.error("取消订单失败，不合法的操作");
         return ResultUtil.error("订单已取消，请刷新页面");
      }
      
      //还原座位
@@ -2450,6 +2468,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);//中断线程
@@ -2463,7 +2489,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) {
@@ -2500,7 +2526,7 @@
                        //所有推送完后的处理
                        Boolean b = pushEndMap.get(orderPrivateCar.getCrossCityOrderId());
                        if (i == querys.size() + 15 && state == 1 && (null != b && !b.booleanValue())) {
                           pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1);
                           pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, 1);
                           OrderPrivateCarServiceImpl.orderIds.remove(orderPrivateCar.getId());
                           pushEndMap.put(orderPrivateCar.getCrossCityOrderId(), Boolean.TRUE);//推送后添加标识
                           break;
@@ -2536,7 +2562,7 @@
                              if (orderType == 1) {
                                 orderPrivateCarMapper.deleteById(orderId);
                              }
                              if (orderType == 2 && orderId != orderTaxi.getId()) {
                              if (orderType == 2 && !orderId.equals(orderTaxi.getId())) {
                                 orderTaxiMapper.deleteById(orderId);
                              }
                           }
@@ -2563,8 +2589,6 @@
                              if (bo) {
                                 continue;
                              }
										
										
                              pushUtil.pushOrderState(2, driver.getId(), orderTaxi.getId(), 2, orderTaxi.getState(), pushOrder.getPushTime());
                           }
                        }
@@ -2572,7 +2596,7 @@
                        //所有推送完后的处理
                        Boolean b = pushEndMap.get(orderTaxi.getCrossCityOrderId());
                        if (i == querys.size() + 15 && state == 1 && (null != b && !b.booleanValue())) {
                           pushUtil.pushEndPush(1, orderTaxi.getUserId(), orderTaxi.getId(), 2);
                           pushUtil.pushEndPush(1, orderTaxi.getUserId(), orderTaxi.getId(), 2, 1);
                           OrderTaxiServiceImpl.orderIds.remove(orderTaxi.getId());
                           pushEndMap.put(orderTaxi.getCrossCityOrderId(), Boolean.TRUE);//推送后添加标识
                        }