合并master分支

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

@@ -47,7 +47,7 @@ public class ShoppingCartAdapter {
 
     public ValidateShopProductRequest getValidateShopProductRequest(CheckCartRequest checkCartRequest) {
         ValidateShopProductRequest validateShopProductRequest = new ValidateShopProductRequest();
-        validateShopProductRequest.setChannel(checkCartRequest.getBusinessType());
+        validateShopProductRequest.setChannel(checkCartRequest.getMenuType());
         validateShopProductRequest.setPartnerId(checkCartRequest.getPartnerId());
         validateShopProductRequest.setStoreId(checkCartRequest.getStoreId());
         validateShopProductRequest.setProductTypeList(new ArrayList<>());

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -248,7 +248,7 @@ public interface ShoppingCartBaseService {
         // 包含：1、普通商品 2、套餐内的固定商品和可选商品
         ShoppingCartAdapter shoppingCartAdapter = SDKCommonBaseContextWare.getBean(ShoppingCartAdapter.class);
         GetProductInfoRequest getSpuProductInfoRequest = shoppingCartAdapter.convertGetProductInfoRequest(checkCartRequest);
-        getSpuProductInfoRequest.setBusinessType(checkCartRequest.getBusinessType());
+        getSpuProductInfoRequest.setMenuType(checkCartRequest.getMenuType());
         BaseResponse<List<ProductBeanDTO>> productInfo = getProductsInfo(getSpuProductInfoRequest);
         if ((productInfo == null) || (!CartResponseConstant.SUCCESS.getCode().equals(productInfo.getCode()))) {
             return;