sunyu::conflicts::resolve code conflicts

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

 package cn.freemud.service.impl.mcoffee.calculation;
 
 import cn.freemud.adapter.ShoppingCartConvertAdapter;
+import cn.freemud.adapter.ShoppingCartMccafeAdapter;
 import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.UserLoginInfoDto;
 import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
@@ -38,6 +39,8 @@ public class SetMealCalculation {
 
     @Autowired
     private ShoppingCartConvertAdapter shoppingCartConvertAdapter;
+    @Autowired
+    private ShoppingCartMccafeAdapter shoppingCartMccafeAdapter;
 
     public void updateShoppingCartGoodsDiscount(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo) {
 
@@ -86,7 +89,7 @@ public class SetMealCalculation {
 
             cartGoods.setOriginalAmount(productGroupTotalAmount + productComboTotalAmount + materialPrice);
             cartGoods.setOriginalPrice(productComboTotalAmount);
-            Long amount = null != cartGoods.getAmount() ? cartGoods.getAmount() + productGroupTotalAmount + materialPrice :
+            Long amount = null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() + productGroupTotalAmount + materialPrice :
                     productGroupTotalAmount + productComboTotalAmount + materialPrice;
             cartGoods.setAmount(amount);
             cartGoods.setFinalPrice(productComboTotalAmount);
@@ -133,11 +136,11 @@ public class SetMealCalculation {
                 int productGroupDiscountAmount = cartGoods.getProductGroupList().stream().mapToInt(t -> t.getFinalPrice().intValue() * t.getQty()).sum();
 //                totalDiscountAmount += discountAmount - productGroupDiscountAmount * cartGoods.getQty();
                 // 添加套餐父商品
-                ShoppingCartGoodsDto.CartGoodsDetailDto parentCartGoods = shoppingCartConvertAdapter.convertCartGoods2DetailGoods(cartGoods, apportionGoods,duplicateGoodsMap);
+                ShoppingCartGoodsDto.CartGoodsDetailDto parentCartGoods = shoppingCartMccafeAdapter.convertCartGoods2DetailGoods(cartGoods, apportionGoods,duplicateGoodsMap);
 //                parentCartGoods.setTotalDiscountAmount(parentCartGoods.getTotalDiscountAmount()+ cartGoods.getOriginalAmount().intValue() - cartGoods.getAmount().intValue());
 //                parentCartGoods.getActivityDiscountsDtos().add(getActivityDiscountsDto(discountAmount - productGroupDiscountAmount * cartGoods.getQty()));
                 // 添加套餐固定商品&可选商品: 做均摊
-                parentCartGoods.setComboProducts(shoppingCartConvertAdapter.convertComboxGoods2DetailGoods(cartGoods,parentCartGoods.getTotalDiscountAmount()));
+                parentCartGoods.setComboProducts(shoppingCartMccafeAdapter.convertComboxGoods2DetailGoods(cartGoods,parentCartGoods.getTotalDiscountAmount()));
                 cartGoodsDetailDtos.add(parentCartGoods);
             }
         }