初始化分支

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -354,5 +354,16 @@ public class OrderController {
         return orderservice.mcCafePollingPickUpCode(vo);
     }
 
+    /**
+     * 根据订单号查询配送操作日志及骑手位置
+     * @param requestVo
+     * @return
+     */
+    @ApiAnnotation(logMessage = "queryOrderRider")
+    @PostMapping("queryOrderRider")
+    public BaseResponse queryOrderRider(@Validated @LogParams @RequestBody OrderRiderRequestVo requestVo){
+        return orderservice.queryOrderRider(requestVo);
+    }
+
 
 }

order-application-service/src/main/java/cn/freemud/entities/vo/OrderRiderRequestVo.java

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+@Data
+public class OrderRiderRequestVo {
+
+    @NotEmpty(message = "sessionId 不能为空")
+    private String sessionId;
+
+    @NotEmpty(message = "订单ID 不能为空")
+    private String oid;
+}

order-application-service/src/main/java/cn/freemud/entities/vo/OrderRiderResponseVo.java

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+
+@Data
+public class OrderRiderResponseVo {
+
+    //static class
+}

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -131,4 +131,6 @@ public interface Orderservice {
     BaseResponse mcCafeQueryOrders(McCafeQueryOrderVo queryOrderVo);
 
     BaseResponse mcCafePollingPickUpCode(MaCafeQueryOrderVo vo );
+
+    BaseResponse queryOrderRider(OrderRiderRequestVo requestVo);
 }

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -102,6 +102,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         requestDto.setExpressChannelName(request.getChannelName());
         requestDto.setExpressNo(request.getChannelDeliveryId());
         requestDto.setOrderSubState(deliveryStatus);
+        requestDto.setRemark(DeliveryStatus.getDeliveryStatusByCode(deliveryStatus).getDesc());
         if (StringUtils.isNotBlank(request.getRemark()))
         {
             requestDto.setRemark("配送:"+request.getRemark());

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1092,6 +1092,22 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success(responseMap);
     }
 
+    @Override
+    public BaseResponse<OrderRiderResponseVo> queryOrderRider(OrderRiderRequestVo requestVo) {
+        BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
+        baseQueryOrderRequest.setOrderId(requestVo.getOid());
+        baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
+        QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
+        if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode()) || response.getData() == null) {
+            return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
+        }
+        QueryOrdersResponse.DataBean.OrderBean orderBean = response.getData();
+
+
+
+        return null;
+    }
+
     private String getRedpacketsPicture(String activityId) {
         if (StringUtils.isNotBlank(activityId)) {
             try {