问题修复

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

@@ -86,10 +86,12 @@ public class BuySendCalculation {
                         CartGoods cartGoods = map.get(o.getGoodsId());
                         if(null != cartGoods) {
                             ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = shoppingCartMccafeAdapter.convertCartGoods2DetailGoodsList(cartGoods, null, null);
-                            cartGoodsDetailDto.setOriginalPrice(0l);
-                            cartGoodsDetailDto.setSalePrice(0l);
-                            cartGoodsDetailDto.setIsSendGoods(true);
-                            shoppingCartGoodsDto.getProducts().add(cartGoodsDetailDto);
+                            if(null != cartGoodsDetailDto) {
+                                cartGoodsDetailDto.setOriginalPrice(0l);
+                                cartGoodsDetailDto.setSalePrice(0l);
+                                cartGoodsDetailDto.setIsSendGoods(true);
+                                shoppingCartGoodsDto.getProducts().add(cartGoodsDetailDto);
+                            }
                         }
                     });
                 }

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

@@ -252,7 +252,9 @@ public class CalculationServiceImpl {
         for (int i = 0, len = cartGoodsList.size(); i < len; i++) {
             CartGoods cartGoods = cartGoodsList.get(i);
             ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = shoppingCartMccafeAdapter.convertCartGoods2DetailGoodsList(cartGoods, apportionGoodsList,duplicateGoodsMap);
-            cartGoodsDetailDtoList.add(cartGoodsDetailDto);
+            if(null != cartGoodsDetailDto) {
+                cartGoodsDetailDtoList.add(cartGoodsDetailDto);
+            }
         }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts = calculationDiscountResult == null ? new ArrayList<>() : calculationDiscountResult.getDiscounts();
         List<ActivityDiscountsDto> activityDiscountsDtos = shoppingCartGoodsDto.getActivityDiscountsDtos() == null ? new ArrayList<>() : shoppingCartGoodsDto.getActivityDiscountsDtos();