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

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

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

@@ -361,6 +361,7 @@ public class OrderServiceImpl implements Orderservice {
         // 查询小程序自提外卖配置信息 校验当前订单类型的下单参数 校验外卖是否满足起送条件
         Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto, shoppingCartGoodsDto, trackingNo);
         OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo, shoppingCartGoodsDto);
+
         //1.9.2套餐需求同步优化创建订单代码
         BaseResponse createOrderOperateDtoResponse = this.sdkCreateOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto);
         if (createOrderOperateDtoResponse == null || !ResponseResult.SUCCESS.getCode().equals(createOrderOperateDtoResponse.getCode()) || createOrderOperateDtoResponse.getResult() == null) {
@@ -606,6 +607,7 @@ public class OrderServiceImpl implements Orderservice {
 
     /**
      * 开通会员卡
+     *
      * @param partnerId 商户号
      * @param ruleId    会员规则ID
      * @param oid       订单号
@@ -1194,13 +1196,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());
-        DeliveryBaseResponse<DeliveryStatusAndRiderPositionDto> deliveryBaseResponse = deliveryFeiginClient.queryDeliveryStatusAndRiderPosition(queryDeliveryBaseRequest);
-        if(RESPONSE_SUCCESS_CODE != deliveryBaseResponse.getCode() && deliveryBaseResponse.getData() !=null){
+        queryDeliveryBaseRequest.setOpenDistance(1);
+        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

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