优惠为空时

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

@@ -391,24 +391,20 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
             BenefitBeanBO benefitBeanBO = benefitBeanBOList.get(0);
             //调用没有加入购物车的提示语的方法
             activityList = setMessageNotInShoppingCart(messageBuilder, activityBO, benefitBeanBOList, benefitBeanBO);
-
-
-        }
-
-
-        //促销返回满减提示语
-        List<CalculationDiscountBO.CalculationDiscountResult.ActivityPrompt> activityPrompts = discountResult.getActivityPrompts();
-        //List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> discounts = discountResult.getDiscounts();
-        /**
-         * 构建提示语
-         */
-        if (CollectionUtils.isNotEmpty(activityPrompts)) {
-            activityList = setMessageSatisfyCart(messageBuilder, activityPrompts, activityBO);
-        }
-        else {
-            activityList = setMessageNoSatisfyCart(messageBuilder, discountResult.getDiscounts());
+        } else {
+            //促销返回满减提示语
+            List<CalculationDiscountBO.CalculationDiscountResult.ActivityPrompt> activityPrompts = discountResult.getActivityPrompts();
+            //List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> discounts = discountResult.getDiscounts();
+            /**
+             * 构建提示语
+             */
+            if (CollectionUtils.isNotEmpty(activityPrompts)) {
+                activityList = setMessageSatisfyCart(messageBuilder, activityPrompts, activityBO);
+            }
+            else {
+                activityList = setMessageNoSatisfyCart(messageBuilder, discountResult.getDiscounts());
+            }
         }
-
         /**
         * 调用促销统一活动查询,过滤出参与的满减(目前只有每满减和阶梯满减)
         */
@@ -438,6 +434,10 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
 
     private CalCostBO getComDiscountResult(BaseAddGoodsBO baseRequestDTO, DiscountResultBO discountResultBO, CalCostBO before) {
 
+        if (before.getGetCalculationDiscountBO() == null){
+            before.setCalculationDiscountBO(new CalculationDiscountBO());
+            return before;
+        }
         CalculationDiscountBO calculationDiscountBO = promotionManager.calculationDiscount(before.getGetCalculationDiscountBO(), baseRequestDTO.getManagerService().getPromotionService());
         before.setCalculationDiscountBO(calculationDiscountBO);
 
@@ -755,7 +755,7 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
 
         ActivityBO activityBO = promotionManager.queryActivityByType(getActivityBO, baseRequestDTO.getManagerService().getPromotionService());
         fullReduction.setActivityBO(activityBO);
-        if (activityBO == null){
+        if (discountResult == null || activityBO == null){
             return fullReduction;
         }
 

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

@@ -371,7 +371,10 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
     }
 
     private CalCostBO getComDiscountResult(ShoppingCartGoodsApportionBO baseRequestDTO, DiscountResultBO discountResultBO, CalCostBO before) {
-
+        if (before.getGetCalculationDiscountBO() == null){
+            before.setCalculationDiscountBO(new CalculationDiscountBO());
+            return before;
+        }
         CalculationDiscountBO calculationDiscountBO = promotionManager.calculationDiscount(before.getGetCalculationDiscountBO(), baseRequestDTO.getManagerService().getPromotionService());
         before.setCalculationDiscountBO(calculationDiscountBO);
 

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

@@ -428,7 +428,10 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
     }
 
     private CalCostBO getComDiscountResult(ListCartGoodsBO baseRequestDTO, DiscountResultBO discountResultBO, CalCostBO before) {
-
+        if (before.getGetCalculationDiscountBO() == null){
+            before.setCalculationDiscountBO(new CalculationDiscountBO());
+            return before;
+        }
         if (CollectionUtils.isNotEmpty(before.getGetCalculationDiscountBO().getGoods())){
             CalculationDiscountBO calculationDiscountBO = promotionManager.calculationDiscount(before.getGetCalculationDiscountBO(), baseRequestDTO.getManagerService().getPromotionService());
             calculationDiscountBO.getResult().setValidCouponMap(before.getValidCouponMap());

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

@@ -357,20 +357,19 @@ public abstract class AbstractUpdateGoodsQtyService implements UpdateGoodsQtySer
             activityList = setMessageNotInShoppingCart(messageBuilder, activityBO, benefitBeanBOList, benefitBeanBO);
 
 
-        }
-
-
-        //促销返回满减提示语
-        List<CalculationDiscountBO.CalculationDiscountResult.ActivityPrompt> activityPrompts = discountResult.getActivityPrompts();
-        //List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> discounts = discountResult.getDiscounts();
-        /**
-         * 构建提示语
-         */
-        if (CollectionUtils.isNotEmpty(activityPrompts)) {
-            activityList = setMessageSatisfyCart(messageBuilder, activityPrompts, activityBO);
-        }
-        else {
-            activityList = setMessageNoSatisfyCart(messageBuilder, discountResult.getDiscounts());
+        } else {
+            //促销返回满减提示语
+            List<CalculationDiscountBO.CalculationDiscountResult.ActivityPrompt> activityPrompts = discountResult.getActivityPrompts();
+            //List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> discounts = discountResult.getDiscounts();
+            /**
+             * 构建提示语
+             */
+            if (CollectionUtils.isNotEmpty(activityPrompts)) {
+                activityList = setMessageSatisfyCart(messageBuilder, activityPrompts, activityBO);
+            }
+            else {
+                activityList = setMessageNoSatisfyCart(messageBuilder, discountResult.getDiscounts());
+            }
         }
 
         /**
@@ -400,7 +399,10 @@ public abstract class AbstractUpdateGoodsQtyService implements UpdateGoodsQtySer
     }
 
     private CalCostBO getComDiscountResult(UpdateAddGoodsBO baseRequestDTO, DiscountResultBO discountResultBO, CalCostBO before) {
-
+        if (before.getGetCalculationDiscountBO() == null){
+            before.setCalculationDiscountBO(new CalculationDiscountBO());
+            return before;
+        }
         CalculationDiscountBO calculationDiscountBO = promotionManager.calculationDiscount(before.getGetCalculationDiscountBO(), baseRequestDTO.getManagerService().getPromotionService());
         before.setCalculationDiscountBO(calculationDiscountBO);
 
@@ -719,7 +721,7 @@ public abstract class AbstractUpdateGoodsQtyService implements UpdateGoodsQtySer
 
         ActivityBO activityBO = promotionManager.queryActivityByType(getActivityBO, baseRequestDTO.getManagerService().getPromotionService());
         fullReduction.setActivityBO(activityBO);
-        if (activityBO == null){
+        if (discountResult == null || activityBO == null){
             return fullReduction;
         }
 

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

@@ -82,11 +82,7 @@ public class PlatformAddGoodsService extends AbstractAddGoodsService {
             }
         }
 
-        //剔除商品数量为空的
-        calculationDiscountGoodsList.removeIf(v->v.getGoodsQuantity().equals(0));
-        if (CollectionUtils.isEmpty(calculationDiscountGoodsList)) {
-            return null;
-        }
+
 
         //组装促销
         calculationSharingDiscountRequestDto.setGoods(calculationDiscountGoodsList);
@@ -94,8 +90,13 @@ public class PlatformAddGoodsService extends AbstractAddGoodsService {
         calculationSharingDiscountRequestDto.setOrgIds(baseRequestDTO.getManagerService().getStoreService().getOrgIds(new GetStoreBO(baseRequestDTO.getPartnerId(), baseRequestDTO.getShopId())));
         calculationSharingDiscountRequestDto.setDistributionFee(deliveryAmount);
         calculationSharingDiscountRequestDto.setIsMember(discountResultBO.getIsMember());
-
-        calCostBO.setGetCalculationDiscountBO(calculationSharingDiscountRequestDto);
+        //剔除商品数量为空的
+        calculationDiscountGoodsList.removeIf(v->v.getGoodsQuantity().equals(0));
+        if (CollectionUtils.isEmpty(calculationDiscountGoodsList)) {
+            calCostBO.setGetCalculationDiscountBO(null);
+        } else {
+            calCostBO.setGetCalculationDiscountBO(calculationSharingDiscountRequestDto);
+        }
         calCostBO.setCartGoods(discountResultBO.getCartGoods());
         return calCostBO;
     }

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

@@ -136,12 +136,6 @@ public class PlatformApportionService extends AbstractApportionService {
             calculationSharingDiscountRequestDto.setSelectActivityList(selectActivityLists);
         }
 
-        //剔除商品数量为空的
-        calculationDiscountGoodsList.removeIf(v->v.getGoodsQuantity().equals(0));
-        if (CollectionUtils.isEmpty(calculationDiscountGoodsList)) {
-            return null;
-        }
-
         //组装促销
         calculationSharingDiscountRequestDto.setGoods(calculationDiscountGoodsList);
         calculationSharingDiscountRequestDto.setCoupons(coupons);
@@ -149,7 +143,13 @@ public class PlatformApportionService extends AbstractApportionService {
         calculationSharingDiscountRequestDto.setDistributionFee(deliveryAmount);
         calculationSharingDiscountRequestDto.setIsMember(discountResultBO.getIsMember());
 
-        calCostBO.setGetCalculationDiscountBO(calculationSharingDiscountRequestDto);
+        //剔除商品数量为空的
+        calculationDiscountGoodsList.removeIf(v->v.getGoodsQuantity().equals(0));
+        if (CollectionUtils.isEmpty(calculationDiscountGoodsList)) {
+            calCostBO.setGetCalculationDiscountBO(null);
+        } else {
+            calCostBO.setGetCalculationDiscountBO(calculationSharingDiscountRequestDto);
+        }
         calCostBO.setValidCouponMap(discountResultBO.getValidCouponMap());
         calCostBO.setCartGoods(discountResultBO.getCartGoods());
         return calCostBO;

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

@@ -147,14 +147,20 @@ public class PlatformListCartGoodsService extends AbstractListCartGoodsService {
             calculationSharingDiscountRequestDto.setSelectActivityList(selectActivityLists);
         }
 
+
         //组装促销
         calculationSharingDiscountRequestDto.setGoods(calculationDiscountGoodsList);
         calculationSharingDiscountRequestDto.setCoupons(coupons);
         calculationSharingDiscountRequestDto.setOrgIds(baseRequestDTO.getManagerService().getStoreService().getOrgIds(new GetStoreBO(baseRequestDTO.getPartnerId(), baseRequestDTO.getShopId())));
         calculationSharingDiscountRequestDto.setDistributionFee(deliveryAmount);
         calculationSharingDiscountRequestDto.setIsMember(discountResultBO.getIsMember());
-
-        calCostBO.setGetCalculationDiscountBO(calculationSharingDiscountRequestDto);
+        //剔除商品数量为空的
+        calculationDiscountGoodsList.removeIf(v->v.getGoodsQuantity().equals(0));
+        if (CollectionUtils.isEmpty(calculationDiscountGoodsList)) {
+            calCostBO.setGetCalculationDiscountBO(null);
+        } else {
+            calCostBO.setGetCalculationDiscountBO(calculationSharingDiscountRequestDto);
+        }
         calCostBO.setValidCouponMap(discountResultBO.getValidCouponMap());
         calCostBO.setCartGoods(discountResultBO.getCartGoods());
         return calCostBO;

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

@@ -94,20 +94,19 @@ public class PlatformUpdateGoodsQtyService extends AbstractUpdateGoodsQtyService
             }
         }
 
-        //剔除商品数量为空的
-        calculationDiscountGoodsList.removeIf(v->v.getGoodsQuantity().equals(0));
-        if (CollectionUtils.isEmpty(calculationDiscountGoodsList)) {
-            return null;
-        }
-
         //组装促销
         calculationSharingDiscountRequestDto.setGoods(calculationDiscountGoodsList);
         calculationSharingDiscountRequestDto.setCoupons(coupons);
         calculationSharingDiscountRequestDto.setOrgIds(baseRequestDTO.getManagerService().getStoreService().getOrgIds(new GetStoreBO(baseRequestDTO.getPartnerId(), baseRequestDTO.getShopId())));
         calculationSharingDiscountRequestDto.setDistributionFee(deliveryAmount);
         calculationSharingDiscountRequestDto.setIsMember(discountResultBO.getIsMember());
-
-        calCostBO.setGetCalculationDiscountBO(calculationSharingDiscountRequestDto);
+        //剔除商品数量为空的
+        calculationDiscountGoodsList.removeIf(v->v.getGoodsQuantity().equals(0));
+        if (CollectionUtils.isEmpty(calculationDiscountGoodsList)) {
+            calCostBO.setGetCalculationDiscountBO(null);
+        } else {
+            calCostBO.setGetCalculationDiscountBO(calculationSharingDiscountRequestDto);
+        }
         calCostBO.setCartGoods(discountResultBO.getCartGoods());
         return calCostBO;
     }