Merge remote-tracking branch 'remotes/origin/feature/1.9.10-购物车接口修改渠道字段-海波' into develop

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

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

@@ -176,7 +176,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             }
 
             // 判断商品状态是否可以加入购物车
-            List<ProductBeanDTO> productInfos = assortmentSdkService.getProductsInfoSdk(request.getPartnerId(), request.getShopId(), Arrays.asList(getProductsVo.getSpuId()),request.getBusinessType(),this.shoppingCartBaseService);
+            List<ProductBeanDTO> productInfos = assortmentSdkService.getProductsInfoSdk(request.getPartnerId(), request.getShopId(), Arrays.asList(getProductsVo.getSpuId()),request.getMenuType(),this.shoppingCartBaseService);
             if (CollectionUtils.isNotEmpty(productInfos)) {
                 ProductBeanDTO productBean = productInfos.get(0);
                 Integer status = productBean.getStatus();
@@ -227,7 +227,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         // 获取商品详细信息
         List<ProductBeanDTO> productBeanListSpuClass = assortmentSdkService.getProductsInfoSdk(partnerId, storeId
-                , Collections.singletonList(spuId2),addShoppingCartGoodsRequestVo.getBusinessType(), this.shoppingCartBaseService);
+                , Collections.singletonList(spuId2),addShoppingCartGoodsRequestVo.getMenuType(), this.shoppingCartBaseService);
 
         //缓存中获取购物车商品信息
         // 注意，围餐和点餐redis数据结构不一样