新增商品类型维护

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

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

@@ -72,6 +72,7 @@ public class ShoppingCartMccafeAdapter {
             cartGoodsDetailDto.setSkuName(StringUtils.isEmpty(comboxGoods.getSkuName()) ? comboxGoods.getSpuName() : comboxGoods.getSkuName());
             cartGoodsDetailDto.setOriginalPrice(comboxGoods.getFinalPrice());
             cartGoodsDetailDto.setPicture(comboxGoods.getPic());
+            cartGoodsDetailDto.setOriginalProductType(cartGoods.getGoodsType());
             int qty = comboxGoods.getQty() * cartGoods.getQty();
             cartGoodsDetailDto.setQty(qty);
             cartGoodsDetailDto.setProductType(comboxGoods.isWeightType() ? ProductType.WEIGHT_PRODUCT.getCode() : ProductType.SETMEAL.getCode());
@@ -153,6 +154,7 @@ public class ShoppingCartMccafeAdapter {
         cartGoodsDetailDto.setOriginalPrice(cartGoods.getFinalPrice());
 //        cartGoodsDetailDto.setTotalDiscountAmount(0);
         cartGoodsDetailDto.setSalePrice(cartGoods.getFinalPrice());
+        cartGoodsDetailDto.setOriginalProductType(cartGoods.getGoodsType());
         cartGoodsDetailDto.setPicture(cartGoods.getPic());
         cartGoodsDetailDto.setQty(cartGoods.getQty());
         cartGoodsDetailDto.setActivityType(cartGoods.getActivityType());

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

@@ -121,6 +121,7 @@ public class MaterialPromotionService implements IPromotionService {
                 product.setOriginalPrice(product.getOriginalPrice() + materialGoods.getOriginalPrice() * (materialGoods.getQty()/product.getQty()));
                 product.setTotalDiscountAmount(product.getTotalDiscountAmount() + materialGoods.getTotalDiscountAmount());
                 product.setProductType(GoodsTypeEnum.MATERIAL.getGoodsType());
+                product.setOriginalProductType(materialGoods.getOriginalProductType());
             }
         }
     }

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

@@ -559,6 +559,7 @@ public class CalculationCommonService {
             com.setExtraList(cartGoodsExtras);
             com.setQty(comb.getQty() * cartGoods.getQty());
             com.setOriginalPrice(comb.getFinalPrice());
+            com.setOriginalProductType(comb.getOriginalProductType());
             //if (isFixed) {
             //    com.setOriginalPrice(comb.getFinalPrice());
             //    com.setQty(comb.getQty() * cartGoods.getQty());

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

@@ -295,6 +295,7 @@ public class AdditionSharingService {
 
         ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = new ShoppingCartGoodsDto.CartGoodsDetailDto();
         cartGoodsDetailDto.setOriginalPrice(hgGood.getOriginalPrice());
+        cartGoodsDetailDto.setOriginalProductType(getProductsVo.getType());
         cartGoodsDetailDto.setTotalDiscountAmount(hgGood.getDiscountAmount().intValue());
         cartGoodsDetailDto.setSpuId(product.getSpuId());
         cartGoodsDetailDto.setSkuId(goodsId);

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

@@ -210,6 +210,7 @@ public class GiftSharingService {
                 dto.setActualActivityGoodsNumber(discount.getActualGoodsNumber());
                 activityDto.add(dto);
                 cartGoodsDetailDto.setActivityDiscountsDtos(activityDto);
+                cartGoodsDetailDto.setOriginalProductType(product.getType());
                 manyCartGoodsDetailDto.add(cartGoodsDetailDto);
             }
             cartGoodsDetailDtoList.addAll(manyCartGoodsDetailDto);