merge冲突

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

@@ -8,7 +8,7 @@ import cn.freemud.demo.entities.bo.goods.DiscountResultBO;
 import cn.freemud.demo.entities.bo.goods.ShoppingCartGoodsApportionBO;
 import cn.freemud.demo.entities.bo.promotion.GetCalculationDiscountBO;
 import cn.freemud.demo.entities.bo.store.GetStoreBO;
-import cn.freemud.demo.service.impl.DeliveryService;
+import cn.freemud.demo.service.impl.DeliveryServiceImpl;
 import cn.freemud.demo.utils.CommonUtils;
 import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
@@ -35,7 +35,7 @@ import static java.util.stream.Collectors.toList;
 public class CalculationSharingAdapter {
 
     @Autowired
-    private DeliveryService deliveryService;
+    private DeliveryServiceImpl deliveryService;
 
     public CalCostBO convert2CalCostBO(GetCalCostBO bo, Boolean isMenuPage){
         DiscountResultBO discountResultBO = bo.getDiscountResultBO();

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/ShoppingCartService.java

 package cn.freemud.demo.service;
 
+import cn.freemud.demo.entities.bo.SendGoods;
 import cn.freemud.demo.entities.bo.goods.CheckCartRequest;
 import cn.freemud.demo.entities.bo.goods.ShoppingCartContext;
 import cn.freemud.demo.entities.bo.goods.list.ListCartGoodsBO;
@@ -16,5 +17,5 @@ public interface ShoppingCartService {
     CheckCartRequest checkShoppingCart(List<CartGoods> cartGoodsList, CartGoods cartGoods,  ShoppingCartContext cartContext);
 
     void updateForPopupWindow(BaseListCartGoodsVO baseListCartGoodsVO, Integer showType, List<PremiumExchangeResponseVo.PremiumExchangeProduct> chooseSendGoodList,
-                                     List<ListCartGoodsBO.SendGoods> sendGoods);
+                                     List<SendGoods> sendGoods);
 }

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

@@ -16,7 +16,6 @@ import cn.freemud.demo.manager.customer.CustomerManager;
 import cn.freemud.demo.manager.product.ProductManager;
 import cn.freemud.demo.manager.store.StoreManager;
 import cn.freemud.demo.service.impl.AbstractAddGoodsService;
-import cn.freemud.demo.service.impl.DeliveryService;
 import cn.freemud.demo.utils.CommonUtils;
 import cn.freemud.entities.dto.CheckSpqInfoRequestDto;
 import cn.freemud.entities.dto.CheckSpqInfoResponseDto;

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

@@ -13,7 +13,6 @@ import cn.freemud.demo.entities.bo.promotion.GetCalculationDiscountBO;
 import cn.freemud.demo.entities.bo.store.GetStoreBO;
 import cn.freemud.demo.manager.product.ProductManager;
 import cn.freemud.demo.service.impl.AbstractApportionService;
-import cn.freemud.demo.service.impl.DeliveryService;
 import cn.freemud.demo.utils.CommonUtils;
 import cn.freemud.entities.dto.CheckSpqInfoRequestDto;
 import cn.freemud.entities.dto.CheckSpqInfoResponseDto;

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

@@ -17,7 +17,6 @@ import cn.freemud.demo.manager.customer.CustomerManager;
 import cn.freemud.demo.manager.product.ProductManager;
 import cn.freemud.demo.manager.store.StoreManager;
 import cn.freemud.demo.service.impl.AbstractListCartGoodsService;
-import cn.freemud.demo.service.impl.DeliveryService;
 import cn.freemud.demo.utils.CommonUtils;
 import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.CheckSpqInfoRequestDto;

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

 package cn.freemud.demo.service.impl;
 
+import cn.freemud.demo.entities.bo.SendGoods;
 import cn.freemud.demo.entities.bo.goods.CheckCartRequest;
 import cn.freemud.demo.entities.bo.goods.ShoppingCartContext;
 import cn.freemud.demo.entities.bo.goods.list.ListCartGoodsBO;
@@ -71,10 +72,10 @@ public class ShoppingBaseServiceImpl implements ShoppingCartService {
     }
 
     @Override
-    public void updateForPopupWindow(BaseListCartGoodsVO baseListCartGoodsVO, Integer showType, List<PremiumExchangeResponseVo.PremiumExchangeProduct> chooseSendGoodList, List<ListCartGoodsBO.SendGoods> sendGoods) {
+    public void updateForPopupWindow(BaseListCartGoodsVO baseListCartGoodsVO, Integer showType, List<PremiumExchangeResponseVo.PremiumExchangeProduct> chooseSendGoodList, List<SendGoods> sendGoods) {
         if (Integer.valueOf("5").equals(showType) && !org.springframework.util.CollectionUtils.isEmpty(chooseSendGoodList)) {
             chooseSendGoodList.forEach(good -> {
-                ListCartGoodsBO.SendGoods first = null;
+                SendGoods first = null;
                 first = sendGoods.stream().filter(a -> a.getGoodsId().equals(good.getSkuId()) || a.getGoodsId().equals(good.getSpuId())).findFirst().orElse(null);
                 if (first == null) return;
                 CartGoods cartGoods = new CartGoods();