Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of…

Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -315,9 +315,9 @@ public class CalculationServiceImpl {
         if (storeInfo == null || storeInfo.getStatusCode() != 100 || storeInfo.getBizVO() == null) {
             throw new ServiceException(ResponseResult.STORE_ITEM_NOT_DELIVERY);
         }
-        if (storeInfo.getBizVO().getDeliveryPrice() == 0) {
-            throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR);
-        }
+//        if (storeInfo.getBizVO().getDeliveryPrice() == 0) {
+//            throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR);
+//        }
         Double deliveryPrice = storeInfo.getBizVO().getDeliveryPrice()*100;
         deliveryAmount = deliveryPrice.longValue();
         return deliveryAmount;