Merge branch '20201127_coco配送进程' into qa

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

@@ -1215,14 +1215,14 @@ public class OrderServiceImpl implements Orderservice {
             return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
         }
         QueryOrdersResponse.DataBean.OrderBean orderBean = response.getData();
-        if(!StringUtils.isNotEmpty(orderBean.getAddInfo().getDeliveryId())){
+        if(!StringUtils.isNotEmpty(orderBean.getAddInfo().getDeliveryId()) || "0".equals(orderBean.getAddInfo().getDeliveryId())){
             return ResponseUtil.error(ResponseResult.DELIVERY_NOT_EXIST);
         }
         QueryDeliveryBaseRequest queryDeliveryBaseRequest = new QueryDeliveryBaseRequest();
         queryDeliveryBaseRequest.setDeliveryId(orderBean.getAddInfo().getDeliveryId());
         queryDeliveryBaseRequest.setOpenDistance(1);
-        DeliveryBaseResponse<DeliveryStatusAndRiderPositionDto> deliveryBaseResponse = deliveryFeiginClient.queryDeliveryStatusAndRiderPosition(queryDeliveryBaseRequest);
-        if(RESPONSE_SUCCESS_CODE != deliveryBaseResponse.getCode() && deliveryBaseResponse.getData() !=null){
+        DeliveryBaseResponse<DeliveryStatusAndRiderPositionDto> deliveryBaseResponse = deliveryFeiginClient.getDeliveryStatusAndRiderPosition(queryDeliveryBaseRequest);
+        if(RESPONSE_SUCCESS_CODE != deliveryBaseResponse.getCode() || response.getData() == null){
             return ResponseUtil.error(ResponseResult.DELIVERY_QUERY_RIDER_ERROR);
         }
         OrderRiderResponseVo responseVo = new OrderRiderResponseVo();

order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java

@@ -28,7 +28,7 @@ public interface DeliveryFeiginClient {
     CreateDeliveryOrderResponseDto deliveryOrderAdd(@RequestBody CreateDeliveryVo request);
 
     @PostMapping("/delivery/getDeliveryStatusAndRiderPosition")
-    DeliveryBaseResponse<DeliveryStatusAndRiderPositionDto> queryDeliveryStatusAndRiderPosition(@RequestBody QueryDeliveryBaseRequest queryDeliveryBaseRequest);
+    DeliveryBaseResponse<DeliveryStatusAndRiderPositionDto> getDeliveryStatusAndRiderPosition(@RequestBody QueryDeliveryBaseRequest queryDeliveryBaseRequest);
 
     @PostMapping("/delivery/getThirdDeliveryFlag")
     DeliveryBaseResponse<GetDeliveryFlagResponseDto> getThirdDeliveryFlag(@RequestBody GetDeliveryFlagRequest getDeliveryFlagRequest);