Merge branch 'feature/1.9.10-购物车接口修改渠道字段-海波' into qa

# 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

@@ -548,7 +548,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
 
         // check购物车中所有商品(商品是否存在，价格变动，券是否支持当前点餐方式)
-        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getOrderType(), tableNumber, shoppingCartBaseService);
+        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getOrderType(), tableNumber,shoppingCartInfoRequestVo.getMenuType(), shoppingCartBaseService);
         com.freemud.sdk.api.assortment.shoppingcart.domain.ShoppingCartGoodsResponseVo cartGoodsResponseVo = checkCartRequest.getShoppingCartGoodsResponseVo();
         //商品不再售卖状态或价格变动，直接返回报错
         if (cartGoodsResponseVo != null) {
@@ -576,7 +576,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             coupons.add(coupon);
         }
         if (CollectionUtils.isNotEmpty(sendGoodsList)) {
-            processSendGoods(sendGoodsList, partnerId, storeId , shoppingCartInfoRequestVo.getBusinessType() , shoppingCartBaseService);
+            processSendGoods(sendGoodsList, partnerId, storeId , shoppingCartInfoRequestVo.getMenuType() , shoppingCartBaseService);
         } else {
             //组装加价购商品
             if (null != premiumExchangeActivity && CollectionUtils.isNotEmpty(premiumExchangeActivity.getProducts())) {