新增原始商品类型

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

assortment-shoppingcart-sdk/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>4.0.3.RELEASE</version>
+            <version>4.0.4.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -530,6 +530,8 @@ public class ShoppingCartAdapter {
         comboxGoods.setName(isComboxGoods ? productComboType.getProductName() : groupDetailType.getProductName());
         comboxGoods.setForeignName(isComboxGoods ? productComboType.getForeignProductName() : groupDetailType.getForeignProductName());
         comboxGoods.setSpuName(comboxGoods.getName());
+        // 组合商品类型存放
+        comboxGoods.setOriginalProductType(isComboxGoods ? productComboType.getProductType() : groupDetailType.getProductType());
         comboxGoods.setSpuForeignName(comboxGoods.getForeignName());
         comboxGoods.setSpecProductId(attributes.get(ATTRIBUTEID));
         comboxGoods.setSubName(attributes.get(ATTRIBUTENAME));

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java

@@ -381,6 +381,12 @@ public class CartGoods {
         private String skuId;
         private String skuName;
         private String skuForeignName;
+
+        /**
+         *  新增存放 商品类型
+         */
+        private Integer originalProductType;
+
         /**
          * 所有属性attributeId的拼接
          */

shopping-cart-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>4.0.3.RELEASE</version>
+            <version>4.0.4.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java

@@ -361,6 +361,14 @@ public class CartGoods {
         private String skuName;
         private String skuForeignName;
         /**
+         * 原有商品类型
+         *
+         * 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
+         * 该字段,保持和商品服务的商品类型一致
+         */
+        private Integer originalProductType;
+
+        /**
          * 所有属性attributeId的拼接
          */
         private String specProductId;

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

@@ -2049,6 +2049,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         cartGoods.setPic(productBeanListSpuClass.get(0).getPicture());
         cartGoods.setWeight(productBeanListSpuClass.get(0).getWeight());
         cartGoods.setUnit(productBeanListSpuClass.get(0).getUnit());
+        // 券商品 设置商品原始类型
+        cartGoods.setOriginalProductType(productBeanListSpuClass.get(0).getType());
         boolean stockLimit = false;
         if (productBeanListSpuClass.get(0).getType() == ProductType.NOSPEC.getCode()
                 && productBeanListSpuClass.get(0).getStockLimit() == 1) {