配送方式

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

@@ -642,12 +642,27 @@ public class CheckOrder {
             storeDeliveryInfoDto.setDeliveryType("self");
             storeDeliveryInfoDto.setPushOrderTime(0);
         } else {
-            if (ObjectUtils.equals(openPlatformIappWxappConfig.getTakeType(), 1)) {
-                storeDeliveryInfoDto.setDeliveryType("self");
-                storeDeliveryInfoDto.setPushOrderTime(0);
-            } else {
-                storeDeliveryInfoDto.setDeliveryType("third");
-                storeDeliveryInfoDto.setPushOrderTime(0);
+            //如果是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);
+                } else {
+                    storeDeliveryInfoDto.setDeliveryType("third");
+                    storeDeliveryInfoDto.setPushOrderTime(0);
+                }
             }
         }
         storeDeliveryInfoDto.setDeliveryCondition(deliveryDetail.getDeliveryType());