Merge branch '2020/09/24-运费券-huiyang' into develop

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

@@ -302,7 +302,7 @@ public class CalculationServiceImpl {
      */
     private Long calculateDeliveryAmount(String receiveId, String partnerId, String storeId, String menuType) {
         Long deliveryAmount = 1000l;
-      /*  if (StringUtils.isBlank(receiveId) || !BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
+        if (StringUtils.isBlank(receiveId) || !BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
             return deliveryAmount;
         }
         String trackingNo = LogThreadLocal.getTrackingNo();
@@ -326,7 +326,7 @@ public class CalculationServiceImpl {
 //            throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR);
 //        }
         Double deliveryPrice = storeInfo.getBizVO().getDeliveryPrice()*100;
-        deliveryAmount = deliveryPrice.longValue();*/
+        deliveryAmount = deliveryPrice.longValue();
         return deliveryAmount;
     }