Merge remote-tracking branch 'origin/feature/coco_three' into qa

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

@@ -306,7 +306,7 @@ public class CheckOrder {
                 }
             }
             //订单金额小于起送费提示
-            else if (2 == storeDeliveryInfoDto.getDeliveryCondition() && storeDeliveryInfoDto.getDeliveryLimitAmount() > shoppingCartGoodsDto.getTotalAmount()) {
+            else if ((2 == storeDeliveryInfoDto.getDeliveryCondition() && storeDeliveryInfoDto.getDeliveryLimitAmount() > shoppingCartGoodsDto.getTotalAmount()) && !cocoPartnerId.contains(createOrderVo.getPartnerId())) {
                 throw new ServiceException(ResponseResult.STORE_DISCONTENT_DELIVERY_FEE);
             }