coco半价行小料半价显示判空

shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/impl/CocoShoppingCartRelationServiceImpl.java

@@ -286,14 +286,18 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
             List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> smallMaterial = goodsDiscountsMap.get(product.getCartGoodsUid()).getSmallMaterial();
             Integer smallMaterialOriTotal = 0;
             Long halfSmallMaterialOriTotal = 0L;
-            for(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial sm : smallMaterial){
-                List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> smDiscounts = sm.getDiscounts();
-                for(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount smDiscount : smDiscounts){
-                    if(ObjectUtils.equals(smDiscount.getType(),ActivityTypeEnum.TYPE_53.getCode())){
-                        halfSmallMaterialOriTotal = halfSmallMaterialOriTotal + smDiscount.getSignleDiscount();
+            if(smallMaterial != null && !smallMaterial.isEmpty()){
+                for(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial sm : smallMaterial){
+                    List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> smDiscounts = sm.getDiscounts();
+                    if(smDiscounts != null && !smDiscounts.isEmpty()){
+                        for(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount smDiscount : smDiscounts){
+                            if(ObjectUtils.equals(smDiscount.getType(),ActivityTypeEnum.TYPE_53.getCode())){
+                                halfSmallMaterialOriTotal = halfSmallMaterialOriTotal + smDiscount.getSignleDiscount();
+                            }
+                        }
                     }
+                    smallMaterialOriTotal = smallMaterialOriTotal + sm.getOriginalPrice();
                 }
-                smallMaterialOriTotal = smallMaterialOriTotal + sm.getOriginalPrice();
             }
 
             // 商品的单价 = 商品单价+小料单价