新增原始商品类型

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -23,6 +23,7 @@ public class ShoppingCartGoodsDto {
      */
     List<CartGoodsDetailDto> products;
     /**
+     *
      * 原总价
      */
     private Long originalTotalAmount;
@@ -120,6 +121,16 @@ public class ShoppingCartGoodsDto {
          * spuId
          */
         private String spuId;
+
+        /**
+         * 原有商品类型
+         *
+         * 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
+         * 该字段,保持和商品服务的商品类型一致
+         */
+        private Integer originalProductType;
+
+
         /**
          * spuId  如果是单品 skuId=spuId
          */

shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java

@@ -16,6 +16,7 @@ import cn.freemud.annotations.IsConvertEN;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.demo.controller.ShoppingCartDemoController;
 import cn.freemud.entities.dto.GetMemberInfoRequestDto;
+import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.coupon.CouponAvailableRequestVo;
 import cn.freemud.enums.CouponTypeEnum;
@@ -28,6 +29,7 @@ import cn.freemud.service.impl.ShoppingCartMealServiceImpl;
 import cn.freemud.service.impl.ShoppingCartNewServiceImpl;
 import cn.freemud.service.impl.ShoppingCartToolsServiceImpl;
 import cn.freemud.utils.ResponseUtil;
+import com.alibaba.fastjson.JSON;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
@@ -36,6 +38,7 @@ import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
+import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import io.swagger.annotations.Api;
 import ma.glasnost.orika.MapperFacade;
 import org.apache.commons.collections4.CollectionUtils;
@@ -193,7 +196,9 @@ public class ShoppingCartController {
         if (instanceByRequest instanceof ShoppingCartNewServiceImpl && SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).newShoppingCartGray(shoppingCartInfoRequestVo.getPartnerId(), shoppingCartInfoRequestVo.getShopId())){
             return shoppingCartDemoController.getShoppingCartGoodsApportion(getShoppingCartGoodsApportionRequestVo);
         } else {
-            return instanceByRequest.getShoppingCartGoods(shoppingCartInfoRequestVo, getShoppingCartGoodsApportionRequestVo.getPremiumExchangeActivity());
+            BaseResponse<ShoppingCartGoodsDto> shoppingCartGoods = instanceByRequest.getShoppingCartGoods(shoppingCartInfoRequestVo, getShoppingCartGoodsApportionRequestVo.getPremiumExchangeActivity());
+            ShoppingSdkLogUtil.infoLog("fisherman getShoppingCartGoodsApportion", JSON.toJSONString(shoppingCartGoods));
+            return shoppingCartGoods;
         }
     }