Merge branch 'feature/1.9.13-mall-20200219-dingkai' into develop

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

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

@@ -111,7 +111,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         //商品skuId或者商品券的商品id
         String spuId2 = spuId;
         // 获取商品详细信息
-        List<ProductBeanDTO> productBeanListSpuClass = assortmentSdkService.getProductsInfoSdk(partnerId, storeId, Collections.singletonList(spuId2),BusinessTypeEnum.SAAS_MALL.getName(), this.shoppingCartBaseService);
+        List<ProductBeanDTO> productBeanListSpuClass = assortmentSdkService.getProductsInfoSdk(partnerId, storeId, Collections.singletonList(spuId2), BusinessTypeEnum.SAAS_MALL.getName(), this.shoppingCartBaseService);
         //查询多个商品库存信息
         queryManyGoodsStocks(addShoppingCartGoodsRequestVo, productIds, productBeanListSpuClass, skuId);
 
@@ -240,7 +240,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
             return;
         }
         GetProductStockRequestDto requestDto = new GetProductStockRequestDto();
-        requestDto.setChannel(BusinessTypeEnum.SAAS_MALL.getCode());
+        requestDto.setChannel(BusinessTypeEnum.SAAS_MALL.getName());
         requestDto.setPartnerId(partnerId);
         requestDto.setStoreId(storeId);
         requestDto.setProductIds(Collections.singletonList(Long.parseLong(cartGoods.getGoodsId())));
@@ -591,7 +591,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
     private void queryManyGoodsStocks(AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, List<Long> productIds
             , List<ProductBeanDTO> productBeanListSpuClass, String skuId) {
         GetProductStockRequestDto requestDto = new GetProductStockRequestDto();
-        requestDto.setChannel(BusinessTypeEnum.SAAS_MALL.getCode());
+        requestDto.setChannel(BusinessTypeEnum.SAAS_MALL.getName());
         requestDto.setPartnerId(addShoppingCartGoodsRequestVo.getPartnerId());
         requestDto.setStoreId(addShoppingCartGoodsRequestVo.getShopId());
         requestDto.setProductIds(productIds);