Merge branch 'KA-20210810-B端下载购物车新增商品类型维护字段' of…

Merge branch 'KA-20210810-B端下载购物车新增商品类型维护字段' of gitlab.freemud.com:order-group-application/order-group into KA-20210810-B端下载购物车新增商品类型维护字段

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -12,7 +12,8 @@
  */
 package cn.freemud.adapter;
 
-import cn.freemud.entities.dto.*;
+import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
+import cn.freemud.entities.dto.GetMenuResponseDto;
 import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.openplatform.WeixinProductRequestDto;
 import cn.freemud.entities.dto.product.*;
@@ -22,13 +23,11 @@ import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.enums.ProductType;
 import cn.freemud.utils.BeanUtil;
-import cn.freemud.utils.ExceptionUtils;
 import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
-import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
@@ -38,7 +37,6 @@ import org.springframework.stereotype.Component;
 
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.LongStream;
 
 @Component
 public class ShoppingCartConvertAdapter {
@@ -101,6 +99,7 @@ public class ShoppingCartConvertAdapter {
         ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = new ShoppingCartGoodsDto.CartGoodsDetailDto();
         cartGoodsDetailDto.setCartGoodsUid(cartGoods.getCartGoodsUid());
         cartGoodsDetailDto.setOriginalGoodsUid(cartGoods.getOriginalGoodsUid());
+        cartGoodsDetailDto.setOriginalProductType(cartGoods.getOriginalProductType());
         cartGoodsDetailDto.setIsSendGoods((cartGoods.getIsSendGoods() !=null && cartGoods.getIsSendGoods()) ? true : false );
         cartGoodsDetailDto.setTaxId(cartGoods.getTaxId());
         cartGoodsDetailDto.setTax(cartGoods.getTax());