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

shopping-cart-application-service/src/main/java/cn/freemud/enums/BusinessTypeEnum.java → assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/enums/BusinessTypeEnum.java

-package cn.freemud.enums;
+package com.freemud.sdk.api.assortment.shoppingcart.enums;
 
 import java.util.Arrays;
 

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

@@ -30,6 +30,7 @@ import com.freemud.application.sdk.api.productcenter.service.ProductService;
 import com.freemud.sdk.api.assortment.shoppingcart.adapter.ShoppingCartAdapter;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.*;
 import com.freemud.sdk.api.assortment.shoppingcart.domain.*;
+import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil;
@@ -141,7 +142,8 @@ public interface ShoppingCartBaseService {
                     .map(CartGoods::getSpuId).collect(Collectors.toList());
 
             if (CollectionUtils.isNotEmpty(spuIds)) {
-                Map<String, GetMenuByIdsResponseDto.DataBean.MenuDetailDto> menuDetailDtoMap = checkMenuProducts(checkCartRequest.getPartnerId(), checkCartRequest.getStoreId(), spuIds, checkCartRequest.getTrackingNo());
+                Map<String, GetMenuByIdsResponseDto.DataBean.MenuDetailDto> menuDetailDtoMap = checkMenuProducts(checkCartRequest.getPartnerId()
+                        , checkCartRequest.getStoreId(), spuIds, checkCartRequest.getTrackingNo(), BusinessTypeEnum.getByType(checkCartRequest.getMenuType()).getCode());
                 // 校验购物车商品是否在菜单
                 Set<String> keySet = null;
                 if (menuDetailDtoMap == null || !(keySet = menuDetailDtoMap.keySet()).containsAll(spuIds)) {
@@ -369,14 +371,14 @@ public interface ShoppingCartBaseService {
 
     default Map<String, GetMenuByIdsResponseDto.DataBean.MenuDetailDto> checkMenuProducts(String partnerId,
                                                                                           String shopId,
-                                                                                          List<String> productIds, String trackingNo) {
+                                                                                          List<String> productIds, String trackingNo,String menuType) {
 
         Map<String, GetMenuByIdsResponseDto.DataBean.MenuDetailDto> menuDetailDtosMap = new HashMap<>();
 
         //查询spu商品是否在菜单
         GetMenuCategoryByIdsRequest getMenuCategoryByIdsDto = GetMenuCategoryByIdsRequest.builder()
                 .businessDate(DateTimeUtils.getCurrentDateTimeStr())
-                .channelType(OrderChannelType.SAAS.getCode())
+                .channelType(menuType)
                 .partnerId(partnerId)
                 .shopId(shopId)
                 .productIds(productIds).build();

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

@@ -4,7 +4,6 @@ import ch.qos.logback.classic.Level;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.ShoppingCartGoodsBaseResponseVo;
-import cn.freemud.enums.BusinessTypeEnum;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.utils.LogUtil;
@@ -15,6 +14,7 @@ import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
+import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;

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

@@ -6,7 +6,6 @@ import cn.freemud.entities.dto.ActivityCalculationDiscountRequestDto;
 import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
-import cn.freemud.enums.BusinessTypeEnum;
 import cn.freemud.enums.ProductType;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
@@ -29,6 +28,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.constant.CartResponseConstant
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.MealClearOperationEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto;
+import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.MealCartBaseServiceImpl;
 import org.apache.commons.lang.StringUtils;