商品券支持套餐

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

@@ -625,31 +625,33 @@ public class CalculationCommonService {
         HashMap<String, BlockRow> map = new HashMap<>();
         if (goods == null) return map;
         //固定搭配
-        if (isFixed) {
-            for (GroupCombox gx : goods.getGroupCombox()) {
-                BlockRow blockRow = new BlockRow();
-                blockRow.setDiscountAmount(gx.getDiscountAmount());
-                blockRow.setGoodsId(gx.getGoodsId());
-                blockRow.setGoodsId(gx.getGoodsId());
-                blockRow.setGoodsQuantity(gx.getGoodsQuantity());
-                blockRow.setOriginalPrice(gx.getOriginalPrice());
-                blockRow.setRealAmount(gx.getRealAmount());
-                List<Discounts> discounts = new ArrayList<>();
-                if (CollectionUtils.isNotEmpty(gx.getDiscounts())) {
-                    for (GoodsDiscount ds : gx.getDiscounts()) {
-                        Discounts discount = new Discounts();
-                        discount.setActivityCode(ds.getActivityCode());
-                        discount.setActivityDesc(ds.getActivityDesc());
-                        discount.setActivityName(ds.getActivityName());
-                        discount.setActualGoodsNumber(ds.getActualGoodsNumber());
-                        discount.setDiscount(ds.getDiscount());
-                        discount.setGoodsId(ds.getGoodsId());
-                        discount.setType(ds.getType());
-                        discounts.add(discount);
+        if (isFixed ) {
+            if(CollectionUtils.isNotEmpty(goods.getGroupCombox())){
+                for (GroupCombox gx : goods.getGroupCombox()) {
+                    BlockRow blockRow = new BlockRow();
+                    blockRow.setDiscountAmount(gx.getDiscountAmount());
+                    blockRow.setGoodsId(gx.getGoodsId());
+                    blockRow.setGoodsId(gx.getGoodsId());
+                    blockRow.setGoodsQuantity(gx.getGoodsQuantity());
+                    blockRow.setOriginalPrice(gx.getOriginalPrice());
+                    blockRow.setRealAmount(gx.getRealAmount());
+                    List<Discounts> discounts = new ArrayList<>();
+                    if (CollectionUtils.isNotEmpty(gx.getDiscounts())) {
+                        for (GoodsDiscount ds : gx.getDiscounts()) {
+                            Discounts discount = new Discounts();
+                            discount.setActivityCode(ds.getActivityCode());
+                            discount.setActivityDesc(ds.getActivityDesc());
+                            discount.setActivityName(ds.getActivityName());
+                            discount.setActualGoodsNumber(ds.getActualGoodsNumber());
+                            discount.setDiscount(ds.getDiscount());
+                            discount.setGoodsId(ds.getGoodsId());
+                            discount.setType(ds.getType());
+                            discounts.add(discount);
+                        }
                     }
+                    blockRow.setDiscounts(discounts);
+                    map.put(gx.getGoodsId(), blockRow);
                 }
-                blockRow.setDiscounts(discounts);
-                map.put(gx.getGoodsId(), blockRow);
             }
         }
         //可选搭配及小料