Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa

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

@@ -7,5 +7,7 @@ public class MCCafeDeliveryGetStoreIdResponse {
 
     private Integer storeId;
 
+    private String extraId;
+
     private String storeName;
 }

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

@@ -649,7 +649,7 @@ public class CheckMCCafeOrder {
             throw new ServiceException(ResponseResult.ORDER_TAKE_OUT_ADDRESS_NOT_VALID);
         } else {
             List<MCCafeDeliveryGetStoreIdResponse> mcCafeDeliveryGetStoreIdResponseList = JSON.parseArray(mcCafeDeliveryBaseResponse.getData().toString(), MCCafeDeliveryGetStoreIdResponse.class);
-            if(mcCafeDeliveryGetStoreIdResponseList.stream().noneMatch(o -> createOrderVo.getShopId().equals(o.getStoreId()+""))) {
+            if(mcCafeDeliveryGetStoreIdResponseList.stream().noneMatch(o -> createOrderVo.getShopId().equals(o.getExtraId()))) {
                 throw new ServiceException(ResponseResult.ORDER_TAKE_OUT_ADDRESS_NOT_DELIVERY);
             }
         }