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

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

order-application-service/src/main/java/cn/freemud/entities/dto/delivery/GetDeliveryFlagRequest.java

+package cn.freemud.entities.dto.delivery;
+
+import lombok.Data;
+
+@Data
+public class GetDeliveryFlagRequest {
+    private String partnerId;
+
+    private String storeId;
+}

order-application-service/src/main/java/cn/freemud/entities/dto/delivery/GetDeliveryFlagResponseDto.java

+package cn.freemud.entities.dto.delivery;
+
+import lombok.Data;
+
+@Data
+public class GetDeliveryFlagResponseDto {
+    private boolean thirdDeliveryFlag;
+}

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

@@ -17,6 +17,9 @@ import cn.freemud.base.util.DateUtil;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.constant.StoreConstant;
 import cn.freemud.entities.dto.*;
+import cn.freemud.entities.dto.delivery.DeliveryBaseResponse;
+import cn.freemud.entities.dto.delivery.GetDeliveryFlagRequest;
+import cn.freemud.entities.dto.delivery.GetDeliveryFlagResponseDto;
 import cn.freemud.entities.dto.order.BusinessDate;
 import cn.freemud.entities.dto.shoppingCart.GetShoppingCartGoodsApportionDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
@@ -28,6 +31,7 @@ import cn.freemud.service.CouponService;
 import cn.freemud.service.adapter.OrderCheckAdapter;
 import cn.freemud.service.order.OrderRelationFactory;
 import cn.freemud.service.order.OrderRelationService;
+import cn.freemud.service.thirdparty.DeliveryFeiginClient;
 import cn.freemud.service.thirdparty.ShoppingCartClient;
 import cn.freemud.utils.LogUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -118,6 +122,12 @@ public class CheckOrder {
     private OrderAdapter orderAdapter;
 
     @Autowired
+    private DeliveryFeiginClient deliveryFeiginClient;
+
+    @Value("${coco.partnerId}")
+    private String cocoPartnerId;
+
+    @Autowired
     private OrderRelationFactory orderRelationFactory;
 
     /**
@@ -684,6 +694,20 @@ public class CheckOrder {
             storeDeliveryInfoDto.setDeliveryType("self");
             storeDeliveryInfoDto.setPushOrderTime(0);
         } else {
+            //如果是coco查询配送服务判断是平台配送还是自配送
+            if(cocoPartnerId.equals(storeResponseDto.getPartnerId())){
+                GetDeliveryFlagRequest getDeliveryFlagRequest = new GetDeliveryFlagRequest();
+                getDeliveryFlagRequest.setPartnerId(storeResponseDto.getPartnerId());
+                getDeliveryFlagRequest.setStoreId(storeResponseDto.getStoreId());
+                DeliveryBaseResponse<GetDeliveryFlagResponseDto> deliveryBaseResponse =  deliveryFeiginClient.getThirdDeliveryFlag(getDeliveryFlagRequest);
+                if(deliveryBaseResponse.getCode() == 100 && deliveryBaseResponse.getData() != null && deliveryBaseResponse.getData().isThirdDeliveryFlag()){
+                    storeDeliveryInfoDto.setDeliveryType("third");
+                    storeDeliveryInfoDto.setPushOrderTime(0);
+                }else {
+                    storeDeliveryInfoDto.setDeliveryType("self");
+                    storeDeliveryInfoDto.setPushOrderTime(0);
+                }
+            }else{
                 if (ObjectUtils.equals(openPlatformIappWxappConfig.getTakeType(), 1)) {
                     storeDeliveryInfoDto.setDeliveryType("self");
                     storeDeliveryInfoDto.setPushOrderTime(0);
@@ -692,6 +716,7 @@ public class CheckOrder {
                     storeDeliveryInfoDto.setPushOrderTime(0);
                 }
             }
+        }
         return storeDeliveryInfoDto;
     }
 

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

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