fix

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/AbstractListCartGoodsService.java

@@ -480,7 +480,7 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
         DeliveryBO delivery = null;
         if (BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(baseRequestDTO.getMenuType())) {
             delivery = this.delivery(distributeBO.getCalculationDiscountBO(), baseRequestDTO,
-                    activityQueryDto, distributeBO.getCalculationDiscountBO().getDistributionFee());
+                    activityQueryDto);
         }
 
         /**
@@ -601,8 +601,7 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
     }
 
     public DeliveryBO delivery(CalculationDiscountBO calculationDiscountBO, ListCartGoodsBO baseRequestDTO
-            , ActivityQueryDto activityQueryDto
-            , Long deliveryAmount) {
+            , ActivityQueryDto activityQueryDto) {
         DeliveryBO deliveryBO = new DeliveryBO();
         DecimalFormat df = new DecimalFormat("###.##");
         List<ActivityTypeEnum> activityTypeEnums = new LinkedList<>();
@@ -619,6 +618,10 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
         }
         CalculationDiscountBO.CalculationDiscountResult.Discount discount=null;
         CalculationDiscountBO.CalculationDiscountResult discountResult = null;
+        Long deliveryAmount = 0L;
+        if (calculationDiscountBO != null){
+            deliveryAmount = calculationDiscountBO.getDistributionFee();
+        }
         if (calculationDiscountBO != null && calculationDiscountBO.getResult() != null && CollectionUtils.isNotEmpty(calculationDiscountBO.getResult().getDiscounts())) {
             discountResult = calculationDiscountBO.getResult();
             discount = discountResult.getDiscounts().stream().filter((d) -> ActivityTypeEnum.TYPE_14.getCode().equals(d.getType())).findFirst().orElse(null);