修改bug

Pu Zhibing

9 小时以前 574cd41b6e4aa65426c7597297aa94f6259d6666

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -487,7 +487,7 @@
//            return ResultUtil.error("司机已到达预约点，取消会产生一定的费用");
//        }
      if (orderTaxi.getState() >= 5 && orderTaxi.getState() != 11) {
         return ResultUtil.error("取消订单失败，不合法的操作");
         return ResultUtil.error("订单已取消，请刷新页面");
      }
      if (null == orderTaxi.getDriverId()) {//没有接单的情况
         if (orderTaxi.getType() == 2) {//摆渡车
@@ -497,71 +497,17 @@
               orderCancelService.saveData(orderPrivateCar1.getId(), 1, "无司机接单", "无司机接单", null, null, 2, 1, uid);
               orderPrivateCar1.setState(10);
               orderPrivateCarService.updateById(orderPrivateCar1);
					
               Driver driver1 = null;
               Company company = null;
               //中台修改订单状态
               ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
               request.setOrderId(orderPrivateCar1.getTravelId());
               request.setStatus(orderPrivateCar1.getState());
               if (null != orderPrivateCar1.getDriverId()) {
                  driver1 = driverService.selectById(orderPrivateCar1.getDriverId());
                  company = companyService.selectById(driver1.getCompanyId());
                  request.setDriverId(driver1.getEmpId().toString());
                  request.setSupplierShopId(company.getEnterCode());
               }
               if (2 == orderPrivateCar1.getPromotion()) {
                  Driver driver2 = driverService.selectById(orderPrivateCar1.getPromotionDriverId());
                  request.setPromoterId(driver2.getEmpId().toString());
               }
               OrderUtil.modifyTravelItinerary(request);
            }
            List<OrderTaxi> list1 = this.selectList(new EntityWrapper<OrderTaxi>().eq("type", 2).eq("crossCityOrderId", orderTaxi.getCrossCityOrderId()).eq("place", orderTaxi.getPlace()));
            for (OrderTaxi orderTaxi1 : list1) {
               orderCancelService.saveData(orderTaxi1.getId(), 2, "无司机接单", "无司机接单", null, null, 2, 1, uid);
               orderTaxi1.setState(10);
               this.updateById(orderTaxi1);
					
               Driver driver1 = null;
               Company company = null;
               //中台修改订单状态
               ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
               request.setOrderId(orderTaxi1.getTravelId());
               request.setStatus(orderTaxi1.getState());
               if (null != orderTaxi1.getDriverId()) {
                  driver1 = driverService.selectById(orderTaxi1.getDriverId());
                  company = companyService.selectById(driver1.getCompanyId());
                  request.setDriverId(driver1.getEmpId().toString());
                  request.setSupplierShopId(company.getEnterCode());
               }
               if (2 == orderTaxi1.getPromotion()) {
                  Driver driver2 = driverService.selectById(orderTaxi1.getPromotionDriverId());
                  request.setPromoterId(driver2.getEmpId().toString());
               }
               OrderUtil.modifyTravelItinerary(request);
            }
         } else {
            integer = orderCancelService.saveData(id, 2, "无司机接单", "无司机接单", null, null, 2, 1, uid);
            orderTaxi.setState(10);
            this.updateById(orderTaxi);
				
            Driver driver1 = null;
            Company company = null;
            //中台修改订单状态
            ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
            request.setOrderId(orderTaxi.getTravelId());
            request.setStatus(orderTaxi.getState());
            if (null != orderTaxi.getDriverId()) {
               driver1 = driverService.selectById(orderTaxi.getDriverId());
               company = companyService.selectById(driver1.getCompanyId());
               request.setDriverId(driver1.getEmpId().toString());
               request.setSupplierShopId(company.getEnterCode());
            }
            if (2 == orderTaxi.getPromotion()) {
               Driver driver2 = driverService.selectById(orderTaxi.getPromotionDriverId());
               request.setPromoterId(driver2.getEmpId().toString());
            }
            OrderUtil.modifyTravelItinerary(request);
         }
      } else {
         OpenCity openCity = openCityService.openCity1(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
@@ -642,7 +588,7 @@
         return ResultUtil.error("取消订单失败，订单信息有误", "");
      }
      if (orderTaxi.getState() != 12) {
         return ResultUtil.error("取消订单失败，不合法的操作", "");
         return ResultUtil.error("订单已取消，请刷新页面", "");
      }
      OrderCancel orderCancel = null;
      if (null == cancleId) {
@@ -1896,10 +1842,7 @@
      if (Integer.valueOf(String.valueOf(map.get("state"))) == 11) {
         map.put("state", map.get("oldState"));
      }
		
      if (Integer.valueOf(String.valueOf(map.get("state"))) == 7 && (map.get("responsibilityType") == null || Integer.valueOf(String.valueOf(map.get("responsibilityType"))) < 4)) {
         map.put("appealButton", 1);
      }

      if (map.get("abnormalIntro") != null) {
         map.put("appealStatus", 1);
      }
@@ -1962,7 +1905,7 @@
      //计算预计距离和剩余时间
      String value = null;
      if (null != orderTaxi.getDriverId()) {
         value = (String) redisTemplate.opsForValue().get("dache_DRIVER" + orderTaxi.getDriverId());
         value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + orderTaxi.getDriverId());
         if (null == value || "".equals(value)) {
            System.err.println("司机没有上传位置信息");
            
@@ -2346,6 +2289,8 @@
                     break;
                  }
                  if (i == querys.size() + 15 && state == 1) {
                     orderTaxi1.setState(10);
                     orderPrivateCarService.updateById(orderTaxi1);
                     pushUtil.pushEndPush(1, orderTaxi.getUserId(), orderTaxi.getId(), 2);
                     orderIds.remove(orderTaxi.getId());
                  }