longz
2026-06-11 e1b58eabfaeb88469ac14172607438a243dbc23c
UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1557,6 +1557,7 @@
   @Override
   public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
      Map<String, Object> map = orderCrossCityMapper.queryOrderInfo(orderId);
      fillDriverScoreForOrderScore(map);
      if (null != map.get("reassignNotice") && Integer.valueOf(String.valueOf(map.get("reassignNotice"))) == 2) {//如果订单有改派提醒,则查询后重置为未提醒
         OrderCrossCity orderCrossCity = this.selectById(orderId);
         orderCrossCity.setReassignNotice(0);
@@ -1585,6 +1586,16 @@
      map.put("device", ToolUtil.isNotEmpty(driverId) ? 2 : 1);
      map.put("orderType", 3);
      return map;
   }
   private void fillDriverScoreForOrderScore(Map<String, Object> map) {
      if (map == null || map.get("score") == null) {
         return;
      }
      Object orderScore = map.get("orderScore");
      if (orderScore == null || Double.valueOf(String.valueOf(orderScore)) == 0D) {
         map.put("orderScore", map.get("score"));
      }
   }
   
   /**
@@ -2791,9 +2802,7 @@
         
         UnPayOrderVO unPayOrderVO = new UnPayOrderVO();
         //添加司机信息
         DriverInfoWarpper driverInfoWarpper = new DriverInfoWarpper();
         Driver driver = driverService.selectById(orderCrossCity.getDriverId());
         BeanUtils.copyProperties(driver, driverInfoWarpper);
         DriverInfoWarpper driverInfoWarpper = DriverInfoWarpper.getDriverInfoWarpper(driverService.queryDriverInfo(orderCrossCity.getDriverId()));
         unPayOrderVO.setDriverInfoWarpper(driverInfoWarpper);
         //其他信息
         BeanUtils.copyProperties(orderCrossCity, unPayOrderVO);