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

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1175,7 +1175,6 @@ public class OrderSdkAdapter {
             data.setOrderPayItem(this.getOrderItemPayList(orderInfoReqs.getOrderPayItemCreateReqList()));
         }
         data.setPayChannelType(orderInfoReqs.getPayChannelType());
-        data.setOrderPayItemCreateReqList(orderInfoReqs.getOrderPayItemCreateReqList());
         data.setPickUpGoodsNo(orderInfoReqs.getPickUpGoodsNo());
         return data;
     }

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<>();