sunyu::resolve conflicts

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

@@ -118,6 +118,19 @@ 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 {
+            cartGoodsDetailDtos.add(convertCartGoods2DetailGoods(cartGoods, apportionGoodsList, duplicateGoodsMap));
+        }
+        return cartGoodsDetailDtos;
+    }
 
     /**
      * @param cartGoods
@@ -267,4 +280,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.*;
@@ -12,7 +13,6 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityChannelEnum;
 import cn.freemud.enums.ActivityTypeEnum;
-import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CommonService;
@@ -24,9 +24,7 @@ import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
 import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
 import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
-import com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
-import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
@@ -81,8 +79,9 @@ public class CalculationServiceImpl {
 
     @Autowired
     private MaterialCalculation materialCalculation;
+
     @Autowired
-    private ShoppingCartConvertAdapter shoppingCartConvertAdapter;
+    private ShoppingCartMccafeAdapter shoppingCartMccafeAdapter;
 
     /**
      * 更新购物车行优惠信息
@@ -197,7 +196,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();