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

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

@@ -301,7 +301,7 @@ public class CalculationServiceImpl {
      * 配送金额
      */
     private Long calculateDeliveryAmount(String receiveId, String partnerId, String storeId, String menuType) {
-        Long deliveryAmount = 1000l;
+        Long deliveryAmount = 0l;
         if (StringUtils.isBlank(receiveId) || !BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
             return deliveryAmount;
         }