修改receiveId判断

2f389e01 · 姜海波 · f6b5978c · 2f389e01
Commit 2f389e01 authored Mar 20, 2020 by 姜海波
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+2 -2

No files found.
--- a/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+++ b/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
@@ -988,7 +988,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
        /**
         * 满额减配送费
         */
-       /* if (calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())) {
+        if (calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())) {
            Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discount
                    = calculationDiscountResult.getDiscounts().stream()
@@ -1001,7 +1001,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                shoppingCartGoodsResponseVo.setThresholdAmount(discount.get().getThresholdAmount());
                shoppingCartGoodsResponseVo.setIsDiscountDelivery(true);
            }
-        }*/
+        }
    }