8.18

liujie

2025-08-19 8e46e35f486a33e419036b1a1387f8bdd19accb0

 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java

@@ -35,6 +35,8 @@
@Service
public class OrderServiceImpl implements IOrderService {



    @Resource
    private IOrderTaxiService orderTaxiService;

@@ -369,12 +371,12 @@
                break;
            case 3://城际
                map = orderCrossCityService.queryPushOrder(orderId);
                String order2 = String.valueOf(map.get("startLon")) + "," + String.valueOf(map.get("startLat"));
                String distance2 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, order2, 1).get("distance");
                String order2 =  String.valueOf(map.get("startLat"))  + "," +String.valueOf(map.get("startLon"));
                String distance2 = gdMapElectricFenceUtil.getDistance(lat + "," + lon, order2, 1).get("distance");
                map.put("startDistance", ToolUtil.isNotEmpty(distance2) ? Double.valueOf(distance2) / 1000 : 0);

                //总距离
                String end2 = String.valueOf(map.get("endLon")) + "," + String.valueOf(map.get("endLat"));
                String end2 =String.valueOf(map.get("endLat"))  + "," + String.valueOf(map.get("endLon")) ;
                distance = gdMapElectricFenceUtil.getDistance(end2, order2, 1).get("distance");
                map.put("totalDistance", ToolUtil.isNotEmpty(distance) ? Double.valueOf(distance) / 1000 : 0);

@@ -477,7 +479,7 @@
            case 2://出租
                return orderTaxiService.grabOrder(orderId, uid);
            case 3://城际
                return ResultUtil.success();//不作任何操作，跨城默认选择的司机
                return orderCrossCityService.grabOrder(orderId, uid);
            case 4://同城小件
                return orderLogisticsService.grabOrder(orderId, uid);
            case 5://跨城小件
@@ -505,7 +507,7 @@
            case 2://出租
                return orderTaxiService.grabOrder_(orderId, uid);
            case 3://城际
                break;
                return orderCrossCityService.grabOrder(orderId, uid);
            case 4://同城小件
                return orderLogisticsService.grabOrder_(orderId, uid);
            case 5://跨城小件