新增开放平台订单骑手位置查询接口，支持实时获取骑手经纬度与位置更新时间，完善相关服务与控制层逻辑

shaofan
1 parent 2dfdc025
Showing 6 changed files with 87 additions and 0 deletions
src/main/java/com/diligrp/rider/controller/OpenDeliveryOrderController.java
src/main/java/com/diligrp/rider/service/DeliveryOrderService.java
src/main/java/com/diligrp/rider/service/RiderLocationService.java
src/main/java/com/diligrp/rider/service/impl/DeliveryOrderServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/RiderLocationServiceImpl.java
src/main/java/com/diligrp/rider/vo/OpenRiderLocationVO.java
@@ -4,6 +4,7 @@ import com.diligrp.rider.common.result.Result;
 import com.diligrp.rider.dto.DeliveryOrderCreateDTO;
 import com.diligrp.rider.service.DeliveryOrderService;
 import com.diligrp.rider.vo.DeliveryOrderCreateVO;
+import com.diligrp.rider.vo.OpenRiderLocationVO;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -57,4 +58,16 @@ public class OpenDeliveryOrderController {
         deliveryOrderService.cancel(appKey, outOrderNo);
         return Result.success();
     }
+
+    /**
+     * 查询订单当前骑手的实时位置
+     * 仅在订单进行中（已接单/服务中）返回；接入方可轮询此接口绘制配送轨迹
+     */
+    @GetMapping("/rider-location")
+    public Result<OpenRiderLocationVO> riderLocation(
+            @RequestParam String outOrderNo,
+            HttpServletRequest request) {
+        String appKey = request.getHeader("X-App-Key");
+        return Result.success(deliveryOrderService.getRiderLocation(appKey, outOrderNo));
+    }
 }
@@ -3,6 +3,7 @@ package com.diligrp.rider.service;
 import com.diligrp.rider.dto.DeliveryOrderCreateDTO;
 import com.diligrp.rider.entity.Orders;
 import com.diligrp.rider.vo.DeliveryOrderCreateVO;
+import com.diligrp.rider.vo.OpenRiderLocationVO;
  
 public interface DeliveryOrderService {
     /**
@@ -20,6 +21,12 @@ public interface DeliveryOrderService {
     /** 取消订单（仅 status=2 可取消） */
     void cancel(String appKey, String outOrderNo);
  
+    /**
+     * 查询订单当前承运骑手的实时位置（供接入方展示配送轨迹）
+     * 仅当订单 status=3 已接单 或 status=4 服务中时返回，其他状态抛业务异常
+     */
+    OpenRiderLocationVO getRiderLocation(String appKey, String outOrderNo);
+
     /** 后台查看配送订单详情 */
     DeliveryOrderCreateVO getAdminDetail(Orders order);
  
 package com.diligrp.rider.service;
  
 import com.diligrp.rider.dto.LocationDTO;
+import com.diligrp.rider.entity.RiderLocation;
 import com.diligrp.rider.vo.AdminRiderDashboardVO;
 import com.diligrp.rider.vo.AdminRiderLocationVO;
 import com.diligrp.rider.vo.NearbyRiderVO;
@@ -15,6 +16,9 @@ public interface RiderLocationService {
     /** 获取骑手位置 */
     LocationDTO getLocation(Long riderId);
  
+    /** 获取骑手最近一次位置记录（含更新时间），供 service 间内部调用 */
+    RiderLocation getLatestLocation(Long riderId);
+
     /** 查询商铺内最近活跃的骑手位置列表 */
     List<AdminRiderLocationVO> listActiveByCity(Long cityId);
  
@@ -9,6 +9,7 @@ import com.diligrp.rider.dto.DeliveryFeeCalcDTO;
 import com.diligrp.rider.dto.DeliveryOrderCreateDTO;
 import com.diligrp.rider.entity.OpenApp;
 import com.diligrp.rider.entity.Orders;
+import com.diligrp.rider.entity.RiderLocation;
 import com.diligrp.rider.mapper.OpenAppMapper;
 import com.diligrp.rider.mapper.OrdersMapper;
 import com.diligrp.rider.service.DeliveryFeeService;
@@ -16,11 +17,13 @@ import com.diligrp.rider.service.DeliveryOrderService;
 import com.diligrp.rider.service.DispatchRuleService;
 import com.diligrp.rider.service.DispatchService;
 import com.diligrp.rider.service.MerchantService;
+import com.diligrp.rider.service.RiderLocationService;
 import com.diligrp.rider.service.WebhookService;
 import com.diligrp.rider.service.AdminMessageService;
 import com.diligrp.rider.vo.DeliveryFeeResultVO;
 import com.diligrp.rider.vo.DeliveryOrderCreateVO;
 import com.diligrp.rider.vo.DispatchRuleTemplateVO;
+import com.diligrp.rider.vo.OpenRiderLocationVO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -49,6 +52,7 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
     private final WebhookService webhookService;
     private final ObjectMapper objectMapper;
     private final AdminMessageService adminMessageService;
+    private final RiderLocationService riderLocationService;
  
     @Override
     @Transactional
@@ -209,6 +213,32 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
     }
  
     @Override
+    public OpenRiderLocationVO getRiderLocation(String appKey, String outOrderNo) {
+        getApp(appKey);
+        Orders order = getOrderByOutNo(appKey, outOrderNo);
+        Integer status = order.getStatus();
+        if (status == null || (status != 3 && status != 4)) {
+            throw new BizException("订单当前状态无法获取骑手位置");
+        }
+        if (order.getRiderId() == null || order.getRiderId() <= 0) {
+            throw new BizException("订单尚未分配骑手");
+        }
+        OpenRiderLocationVO vo = new OpenRiderLocationVO();
+        vo.setOutOrderNo(order.getOutOrderNo());
+        vo.setStatus(status);
+        RiderLocation location = riderLocationService.getLatestLocation(order.getRiderId());
+        if (location != null) {
+            try {
+                vo.setLng(new BigDecimal(location.getLng()));
+                vo.setLat(new BigDecimal(location.getLat()));
+            } catch (Exception ignored) {
+            }
+            vo.setUpdateTime(location.getUpdateTime());
+        }
+        return vo;
+    }
+
+    @Override
     public DeliveryOrderCreateVO getAdminDetail(Orders order) {
         return toCreateVO(order, buildFeeVO(order));
     }
@@ -83,6 +83,15 @@ public class RiderLocationServiceImpl implements RiderLocationService {
         return dto;
     }
  
+    @Override
+    public RiderLocation getLatestLocation(Long riderId) {
+        if (riderId == null || riderId <= 0) {
+            return null;
+        }
+        return locationMapper.selectOne(new LambdaQueryWrapper<RiderLocation>()
+                .eq(RiderLocation::getUid, riderId));
+    }
+
     /**
      * 查询指定商铺最近活跃的骑手位置列表。
      */
+package com.diligrp.rider.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 开放平台：订单维度的骑手实时位置
+ * 只在订单进行中（status=3 已接单 / 4 服务中）返回
+ * 骑手身份信息（姓名/手机）不对外暴露
+ */
+@Data
+public class OpenRiderLocationVO {
+    /** 外部业务系统订单号（回显） */
+    private String outOrderNo;
+    /** 订单状态：3=已接单 4=服务中 */
+    private Integer status;
+    /** 骑手位置经度，骑手尚未上报时为 null */
+    private BigDecimal lng;
+    /** 骑手位置纬度，骑手尚未上报时为 null */
+    private BigDecimal lat;
+    /** 位置最近一次上报时间（秒），骑手尚未上报时为 null */
+    private Long updateTime;
+}