Merge branch 'feature/1.9.9_购物车校验' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/request/CheckCartRequest.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuyAndGiftsPromotionService.java

assortment-ordercenter-sdk/readme.md

@@ -14,5 +14,6 @@
 | 1.1.3-SNAPSHOT | 围餐商品删除 | 丁凯    | 2020-01-07 |
 | 1.1.1.RELEASE| 1.9.9sessionKey  | 胡超 | 20200108  |
 | 1.1.2.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 20200108  |
+| 1.1.3.RELEASE| 1.9.10需求打包release版本（thirdCateId）  | 胡超 | 20200113  |
 | 1.1.4-SNAPSHOT | 订单渠道新增支付宝 | 侯书虎    | 2020-01-09 |
 | 1.1.5-SNAPSHOT | 创建订单新增第三方品类id字段 | 侯书虎    | 2020-01-13 |
\ No newline at end of file

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

@@ -46,7 +46,7 @@ public class ShoppingCartAdapter {
 
     public ValidateShopProductRequest getValidateShopProductRequest(CheckCartRequest checkCartRequest){
         ValidateShopProductRequest validateShopProductRequest = new ValidateShopProductRequest();
-        validateShopProductRequest.setChannel(OrderChannelType.SAAS.getCode());
+        validateShopProductRequest.setChannel(checkCartRequest.getBusinessType());
         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

@@ -198,12 +198,6 @@ public interface ShoppingCartBaseService {
 
             List<ProductBeanDTO> productList = valiadResult.getSuccessList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
             CartGoodsStates cartGoodsStates = new CartGoodsStates();
-            //更新购物车详细信息
-            if (CollectionUtils.isEmpty(checkCartRequest.getCartGoodsList()) || CollectionUtils.isEmpty(productList)){
-                checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
-                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
-                return CartResponseUtil.error(valiadResponse.getMessage(),checkCartRequest);
-            }
             for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
                 // 当goodsId为空或商品是商品券时直接跳过
                 if (StringUtils.isEmpty(cartGoods.getGoodsId()) || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.COUPON_GOODS.getGoodsType())) {
@@ -245,6 +239,7 @@ public interface ShoppingCartBaseService {
         // 包含：1、普通商品 2、套餐内的固定商品和可选商品
         ShoppingCartAdapter shoppingCartAdapter = SDKCommonBaseContextWare.getBean(ShoppingCartAdapter.class);
         GetProductInfoRequest getSpuProductInfoRequest = shoppingCartAdapter.convertGetProductInfoRequest(checkCartRequest);
+        getSpuProductInfoRequest.setBusinessType(checkCartRequest.getBusinessType());
         BaseResponse<List<ProductBeanDTO>> productInfo = getProductsInfo(getSpuProductInfoRequest);
         if ((productInfo == null) || (!CartResponseConstant.SUCCESS.getCode().equals(productInfo.getCode()))) {
             return;