Merge remote-tracking branch 'origin/qa' into qa

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -728,6 +728,7 @@ public class ShoppingCartConvertAdapter {
         //加料信息为空
         if (CollectionUtils.isEmpty(spuProduct.getAdditionalGroupList())) {
             checkSkuMaterialProductForMccafe(cartGoods,spuProduct);
+            return;
         }
         //提取加料信息
         List<String> materialSpu = new ArrayList<>();