fix

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

@@ -668,10 +668,10 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
      *
      */
     public BuyMemberCardBO addNeedCardAmount(ShoppingCartGoodsApportionBO baseRequestDTO) {
-        BuyMemberCardBO buyMemberCardBO = null;
+        BuyMemberCardBO buyMemberCardBO = new BuyMemberCardBO();
         ShoppingCartGoodsApportionBO.BuyMemberCard buyMemberCard = baseRequestDTO.getBuyMemberCard();
         if (baseRequestDTO.getBuyMemberCard() == null || StringUtils.isEmpty(buyMemberCard.getPaidId()) || StringUtils.isEmpty(buyMemberCard.getRuleId())) {
-            return buyMemberCardBO;
+            return null;
         }
         GetPaidRuleRequestBO getPaidRuleRequestDto = new GetPaidRuleRequestBO();
         getPaidRuleRequestDto.setPartnerId(baseRequestDTO.getPartnerId());
@@ -679,7 +679,7 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
         getPaidRuleRequestDto.setRuleId(buyMemberCard.getRuleId());
         PaidRuleResponseBO paidRule = customerManager.getPaidRule(getPaidRuleRequestDto, baseRequestDTO.getManagerService().getCustomerService());
         if (paidRule == null){
-            return buyMemberCardBO;
+            return null;
         }
         // 购买会员卡的金额
         Integer activityPrice = paidRule.getActivityPrice();
@@ -880,12 +880,12 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
 
     public ApportionAdditionBO additionResponse(CalculationDiscountBO.CalculationDiscountResult discountResult
             , ShoppingCartGoodsApportionBO baseRequestDTO) {
-        ApportionAdditionBO additionBO = null;
+        ApportionAdditionBO additionBO = new ApportionAdditionBO();
 
         List<ShoppingCartApportionBO.CartGoodsDetailDto> addCartGoodsDetailList = new ArrayList<>();
         ShoppingCartGoodsApportionBO.PremiumExchangeActivity premiumExchangeActivity = baseRequestDTO.getPremiumExchangeActivity();
         if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods()) || premiumExchangeActivity == null || CollectionUtils.isEmpty(premiumExchangeActivity.getProducts())) {
-            return additionBO;
+            return null;
         }
         List<CalculationDiscountBO.CalculationDiscountResult.Goods> manyHgs = discountResult.getGoods()
                 .stream()

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

@@ -559,10 +559,10 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
      *
      */
     public BuyMemberCardBO addNeedCardAmount(ListCartGoodsBO baseRequestDTO) {
-        BuyMemberCardBO buyMemberCardBO = null;
+        BuyMemberCardBO buyMemberCardBO = new BuyMemberCardBO();
         ShoppingCartInfoRequestVo.BuyMemberCard buyMemberCard = baseRequestDTO.getBuyMemberCard();
         if (baseRequestDTO.getBuyMemberCard() == null || StringUtils.isEmpty(buyMemberCard.getPaidId()) || StringUtils.isEmpty(buyMemberCard.getRuleId())) {
-            return buyMemberCardBO;
+            return null;
         }
         GetPaidRuleRequestBO getPaidRuleRequestDto = new GetPaidRuleRequestBO();
         getPaidRuleRequestDto.setPartnerId(baseRequestDTO.getPartnerId());