Merge branch 'feature/20201222_combo券需求_yu.sun'

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

@@ -118,6 +118,23 @@ public class ShoppingCartMccafeAdapter {
         return cartGoodsDetailDtos;
     }
 
+    /**
+     * @param cartGoods
+     * @return
+     */
+    public List<ShoppingCartGoodsDto.CartGoodsDetailDto> convertCartGoods2DetailGoodsList(CartGoods cartGoods, List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods> apportionGoodsList, Map<String, String> duplicateGoodsMap) {
+        List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = new ArrayList<>();
+        if (StringUtils.isEmpty(cartGoods.getCouponCode()) && GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+            return cartGoodsDetailDtos;
+        } else {
+            ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = convertCartGoods2DetailGoods(cartGoods, apportionGoodsList, duplicateGoodsMap);
+            if(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                cartGoodsDetailDto.setComboProducts(this.convertComboxGoods2DetailGoods(cartGoods,cartGoodsDetailDto.getTotalDiscountAmount()));
+            }
+            cartGoodsDetailDtos.add(cartGoodsDetailDto);
+        }
+        return cartGoodsDetailDtos;
+    }
 
     /**
      * @param cartGoods
@@ -157,6 +174,7 @@ public class ShoppingCartMccafeAdapter {
         } else if (cartGoods.isWeightType()) {
             cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
         }
+
         //小料
         if (CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())) {
             List<ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods> materialList = new ArrayList<>(0);
@@ -193,6 +211,65 @@ public class ShoppingCartMccafeAdapter {
         return cartGoodsDetailDto;
     }
 
+
+
+    public ShoppingCartGoodsDto.CartGoodsDetailDto convertComboProduct2DetailGoods(CartGoods.ComboxGoods cartGoods) {
+        // 设置基础信息
+        ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = new ShoppingCartGoodsDto.CartGoodsDetailDto();
+//        cartGoodsDetailDto.setCartGoodsUid(cartGoods.getCartGoodsUid());
+        cartGoodsDetailDto.setTaxId(cartGoods.getTaxId());
+        cartGoodsDetailDto.setTax(cartGoods.getTax());
+        cartGoodsDetailDto.setSpuId(cartGoods.getSpuId());
+        cartGoodsDetailDto.setSpuName(cartGoods.getSpuName());
+        cartGoodsDetailDto.setSkuId(StringUtils.isEmpty(cartGoods.getSkuId()) ? cartGoods.getSpuId() : cartGoods.getSkuId());
+        cartGoodsDetailDto.setSkuName(StringUtils.isEmpty(cartGoods.getSkuName()) ? cartGoods.getSpuName() : cartGoods.getSkuName());
+        cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
+        cartGoodsDetailDto.setSalePrice(cartGoods.getOriginalPrice());
+        cartGoodsDetailDto.setPicture(cartGoods.getPic());
+        cartGoodsDetailDto.setQty(cartGoods.getQty());
+//        cartGoodsDetailDto.setActivityType(cartGoods.getActivityType());
+//        cartGoodsDetailDto.setNodeId(cartGoods.getNodeId());
+//        cartGoodsDetailDto.setCategoryName(cartGoods.getCategoryName());
+//        cartGoodsDetailDto.setCouponCode(cartGoods.getCouponCode());
+//        cartGoodsDetailDto.setStockLimit(cartGoods.isStockLimit());
+        cartGoodsDetailDto.setProductCode(cartGoods.getCustomerCode());
+        cartGoodsDetailDto.setCustomerCode(cartGoods.getCustomerCode());
+        cartGoodsDetailDto.setWeight(cartGoods.getWeight());
+        cartGoodsDetailDto.setUnit(cartGoods.getUnit());
+        cartGoodsDetailDto.setActivityDiscountsDtos(new ArrayList<>());
+        cartGoodsDetailDto.setTotalDiscountAmount(0);
+//        cartGoodsDetailDto.setSpecialExtra(cartGoods.getSpecialExtra());
+//        cartGoodsDetailDto.setClassificationId(cartGoods.getClassificationId());
+//        cartGoodsDetailDto.setClassificationName(cartGoods.getClassificationName());
+//        if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+//            cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
+//        } else if (cartGoods.isWeightType()) {
+//            cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
+//        }
+
+        //小料
+        if (CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())) {
+            List<ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods> materialList = new ArrayList<>(0);
+            for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
+                ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods goods = new ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods();
+                goods.setSpuId(materialGoods.getSpuId());
+                goods.setSpuName(materialGoods.getSpuName());
+                goods.setOriginalPrice(materialGoods.getOriginalPrice());
+                goods.setSalePrice(materialGoods.getFinalPrice());
+                goods.setCustomerCode(materialGoods.getCustomerCode());
+                goods.setProductCode(materialGoods.getCustomerCode());
+                goods.setQty(cartGoods.getQty());
+                goods.setTotalDiscountAmount(0);
+                materialList.add(goods);
+            }
+            cartGoodsDetailDto.setMaterialList(materialList);
+        }
+        // 设置总优惠&售价
+        List<ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra> cartGoodsExtras = BeanUtil.convertBeans(cartGoods.getExtra(), ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra::new);
+        cartGoodsDetailDto.setExtraList(cartGoodsExtras);
+        return cartGoodsDetailDto;
+    }
+
     /**
      *  活动级别的促销均摊
      * 获取当前商品的售后价格
@@ -267,4 +344,4 @@ public class ShoppingCartMccafeAdapter {
         }
         cartGoodsDetailDto.setActivityDiscountsDtos(activityDiscountsDtoList);
     }
-}
+}
\ No newline at end of file

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -2,6 +2,7 @@ package cn.freemud.service.impl.mcoffee.calculation;
 
 import cn.freemud.adapter.ActivityAdapter;
 import cn.freemud.adapter.ShoppingCartConvertAdapter;
+import cn.freemud.adapter.ShoppingCartMccafeAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.dto.*;
@@ -81,8 +82,12 @@ public class CalculationServiceImpl {
 
     @Autowired
     private MaterialCalculation materialCalculation;
+//    @Autowired
+//    private ShoppingCartConvertAdapter shoppingCartConvertAdapter;
     @Autowired
-    private ShoppingCartConvertAdapter shoppingCartConvertAdapter;
+    private ShoppingCartMccafeAdapter shoppingCartMccafeAdapter;
+//    @Autowired
+//    private ItemServiceImpl itemService;
 
     /**
      * 更新购物车行优惠信息
@@ -197,7 +202,8 @@ public class CalculationServiceImpl {
         });
         for (int i = 0, len = cartGoodsList.size(); i < len; i++) {
             CartGoods cartGoods = cartGoodsList.get(i);
-            List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = shoppingCartConvertAdapter.convertCartGoods2DetailGoodsList(cartGoods, apportionGoodsList,duplicateGoodsMap);
+//            List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = shoppingCartConvertAdapter.convertCartGoods2DetailGoodsList(cartGoods, apportionGoodsList,duplicateGoodsMap);
+            List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = shoppingCartMccafeAdapter.convertCartGoods2DetailGoodsList(cartGoods, apportionGoodsList,duplicateGoodsMap);
             cartGoodsDetailDtoList.addAll(cartGoodsDetailDtos);
         }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts = calculationDiscountResult == null ? new ArrayList<>() : calculationDiscountResult.getDiscounts();

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/SetMealCalculation.java

@@ -92,15 +92,17 @@ public class SetMealCalculation {
                 }
             }
 
-
-            Long amount = null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice()*cartGoods.getQty() + productGroupTotalAmount + materialPrice :
-                    productGroupTotalAmount + productComboTotalAmount + materialPrice;
+            //如果是商品券商品，不重新计算套餐价格
+            if (StringUtils.isEmpty(cartGoods.getCouponCode())) {
+                Long amount = null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() * cartGoods.getQty() + productGroupTotalAmount + materialPrice :
+                        productGroupTotalAmount + productComboTotalAmount + materialPrice;
+                cartGoods.setAmount(amount);
+            }
             Long comboOriginalPriceAmount = null != cartGoods.getOriginalAmount() ? cartGoods.getOriginalAmount() :
                     productComboTotalAmount;
             cartGoods.setOriginalAmount(productGroupTotalAmount + comboOriginalPriceAmount + materialPrice);
             cartGoods.setOriginalPrice(null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() :
                     productComboTotalAmount);
-            cartGoods.setAmount(amount);
             cartGoods.setFinalPrice(null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() :
                     productComboTotalAmount);
 
@@ -138,7 +140,7 @@ public class SetMealCalculation {
         });
         // 套餐优惠明细
         for (CartGoods cartGoods : shoppingCartGoodsResponseVo.getProducts()) {
-            if (ObjectUtils.equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType())) {
+            if (ObjectUtils.equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType()) && StringUtils.isBlank(cartGoods.getCouponCode())) {
                 // discountAmount=(套餐原价-套餐售价)*数量
                 // productGroupDiscountAmount=可选商品现价总和
                 // discountAmount-productGroupDiscountAmount:  当前商品行套餐商品总优惠= 套餐原总价-套餐现总价-套餐可选商品的现总价