Merge branch 'feature/new-fixbig' into qa

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -315,6 +315,10 @@ public class ShoppingCartAdapter {
                         updateComboxGoodsInfoNew(productGroup, spuProduct, false);
                     }
                 }
+                //0元套餐 必须选可选或是可选
+                if (CollectionUtils.isEmpty(cartGoods.getProductComboList()) && CollectionUtils.isEmpty(cartGoods.getProductGroupList())) {
+                    cartGoods.setCartGoodsUid("");
+                }
             }
             //更新当前商品行价格
             Long newOrigOriginalPrice = 0L;