商品券支持套餐

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

@@ -625,7 +625,8 @@ public class CalculationCommonService {
         HashMap<String, BlockRow> map = new HashMap<>();
         if (goods == null) return map;
         //固定搭配
-        if (isFixed) {
+        if (isFixed ) {
+            if(CollectionUtils.isNotEmpty(goods.getGroupCombox())){
                 for (GroupCombox gx : goods.getGroupCombox()) {
                     BlockRow blockRow = new BlockRow();
                     blockRow.setDiscountAmount(gx.getDiscountAmount());
@@ -652,6 +653,7 @@ public class CalculationCommonService {
                     map.put(gx.getGoodsId(), blockRow);
                 }
             }
+        }
         //可选搭配及小料
         else {
             List<BlockRow> blockRows = new ArrayList<>();