Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/FullSharingService.java

@@ -326,6 +326,7 @@ public class FullSharingService {
     public HashMap<String, Long>  drawnFullDiscount(List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> materialDiscount,List<Integer> typeEnums,int type) {
         HashMap<String, Long> hashMap = new HashMap<>();
         for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial smallMaterial : materialDiscount) {
+            if (CollectionUtils.isEmpty(smallMaterial.getDiscounts())) continue;
             for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : smallMaterial.getDiscounts()) {
                 if (typeEnums.contains(discount.getType())) {
                     hashMap.put(discount.getGoodsId(),discount.getDiscount());
@@ -341,6 +342,7 @@ public class FullSharingService {
     public HashMap<String, Long>  drawnFullDiscount(List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GroupCombox> groupCombDiscount,List<Integer> typeEnums) {
         HashMap<String, Long> hashMap = new HashMap<>();
         for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GroupCombox com : groupCombDiscount) {
+            if (CollectionUtils.isEmpty(com.getDiscounts())) continue;
             for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : com.getDiscounts()) {
                 if (typeEnums.contains(discount.getType())) {
                     hashMap.put(discount.getGoodsId(),discount.getDiscount());