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

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

@@ -156,6 +156,7 @@ public class ShoppingCartConvertAdapter {
                 goods.setProductCode(materialGoods.getCustomerCode());
                 goods.setQty(materialGoods.getQty());
                 goods.setTotalDiscountAmount(0);
+                goods.setOriginalProductType(materialGoods.getOriginalProductType());
                 materialList.add(goods);
             }
             cartGoodsDetailDto.setMaterialList(materialList);
@@ -319,6 +320,7 @@ public class ShoppingCartConvertAdapter {
                     goods.setTotalDiscountAmount(0);
                     goods.setProductCode(materialGoods.getCustomerCode());
                     goods.setCustomerCode(materialGoods.getCustomerCode());
+                    goods.setOriginalProductType(materialGoods.getOriginalProductType());
                     materialList.add(goods);
                 }
                 cartGoodsDetailDto.setMaterialList(materialList);

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

@@ -98,6 +98,7 @@ public class ShoppingCartMccafeAdapter {
                     goods.setTotalDiscountAmount(0);
                     goods.setProductCode(materialGoods.getCustomerCode());
                     goods.setCustomerCode(materialGoods.getCustomerCode());
+                    goods.setOriginalProductType(materialGoods.getOriginalProductType());
                     materialList.add(goods);
                 }
                 cartGoodsDetailDto.setMaterialList(materialList);
@@ -193,6 +194,7 @@ public class ShoppingCartMccafeAdapter {
                 goods.setProductCode(materialGoods.getCustomerCode());
                 goods.setQty(cartGoods.getQty());
                 goods.setTotalDiscountAmount(0);
+                goods.setOriginalProductType(materialGoods.getOriginalProductType());
                 materialList.add(goods);
             }
             cartGoodsDetailDto.setMaterialList(materialList);

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

@@ -379,6 +379,14 @@ public class ShoppingCartGoodsDto {
         @Data
         public static class MaterialGoods {
             /**
+             * 原有商品类型
+             *
+             * 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
+             * 该字段,保持和商品服务的商品类型一致
+             */
+            private Integer originalProductType;
+
+            /**
              * 加料商品ID
              */
             private String spuId;

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

@@ -476,6 +476,7 @@ public class CalculationCommonService {
                     List<ActivityDiscountsDto> smDiscount = this.drawSmallDiscount(blockRow.getDiscounts());
                     goods.setActivityDiscountsDtos(smDiscount);
                 }
+                goods.setOriginalProductType(mg.getOriginalProductType());
                 materialList.add(goods);
                 cartGoodsDetailDto.setOriginalPrice(cartGoodsDetailDto.getOriginalPrice() + goods.getOriginalPrice() * (goods.getQty()/cartGoodsDetailDto.getQty()));
                 cartGoodsDetailDto.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount() + goods.getTotalDiscountAmount());