赠品添加到购物车修改

shopping-cart-application-service/src/main/java/cn/freemud/service/active/ActiveFactory.java

@@ -28,5 +28,5 @@ public interface ActiveFactory {
      * @param
      * @return
      */
-    ActiveService getGifAddCartService(ShoppingCartInfoRequestVo shoppingCartInfoRequestVo);
+    ActiveService getGifAddCartService(String partnerId);
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/active/ActiveService.java

@@ -38,5 +38,6 @@ public interface ActiveService {
                     List<CartGoods> addcartGoodsList,
                     List<ProductBeanDTO> products ,
                     ShoppingCartInfoRequestVo shoppingCartInfoRequestVo,
-                    CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult);
+                    CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult,
+                    String partnerId);
 }

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

@@ -57,8 +57,8 @@ public class ActiveFactoryImpl implements ActiveFactory {
     }
 
     @Override
-    public ActiveService getGifAddCartService(ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
-        if(cocoPartnerId.contains(shoppingCartInfoRequestVo.getPartnerId())){
+    public ActiveService getGifAddCartService(String partnerId) {
+        if(cocoPartnerId.contains(partnerId)){
             return CocoActiveServiceImpl;
         }else{
             return platformActiveService;

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

@@ -76,13 +76,14 @@ public class CocoActiveServiceImpl implements ActiveService {
                            List<CartGoods> addcartGoodsList,
                            List<ProductBeanDTO> products ,
                            ShoppingCartInfoRequestVo shoppingCartInfoRequestVo,
-                           CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult) {
+                           CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult,
+                           String partnerId) {
 
         // 点餐页赠品分行显示，赠品显示小料
         // 结束页赠品合并到主商品行
         // 创单查询购物车分行显示
         Map<String, CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> discountForGift = this.getDiscountForGift(discountResult);
-        if(ObjectUtils.equals(shoppingCartInfoRequestVo.getFlag(),1)){//结算页
+        if(ObjectUtils.equals(partnerId,1)){//结算页
             for(CartGoods cgs : oldcartGoodsLists){
                 if(null == discountForGift.get(cgs.getCartGoodsUid())){
                     break;

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

@@ -69,7 +69,8 @@ public class PlatformActiveServiceImpl implements ActiveService {
     public void gifAddCart(List<CartGoods> oldcartGoodsLists,
                            List<CartGoods> addcartGoodsList, List<ProductBeanDTO> products ,
                            ShoppingCartInfoRequestVo shoppingCartInfoRequestVo,
-                           CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult) {
+                           CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult,
+                           String partnerId) {
 
         Map<String, CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> discountForGift = this.getDiscountForGift(discountResult);
 

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

@@ -333,7 +333,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , activityQueryDto
                     , menuType
                     , deliveryAmount
-                    , ShoppingCartConstant.ADD_AND_UPDATE);
+                    , ShoppingCartConstant.ADD_AND_UPDATE
+                    , partnerId);
 
             buildDiscounts(shoppingCartGoodsResponseVo,discountResult);
         }
@@ -457,7 +458,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , activityQueryDto
                     , menuType
                     , deliveryAmount
-                    , ShoppingCartConstant.ADD_AND_UPDATE);
+                    , ShoppingCartConstant.ADD_AND_UPDATE
+                    , partnerId);
 
             buildDiscounts(shoppingCartGoodsResponseVo,discountResult);
         }
@@ -626,7 +628,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , activityQueryDto
                     , menuType
                     , deliveryAmount
-                    , ShoppingCartConstant.QUERY_INFO);
+                    , ShoppingCartConstant.QUERY_INFO
+                    , partnerId);
 
             buildDiscounts(shoppingCartGoodsResponseVo,calculationSharingDiscountResult);
         }

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

@@ -66,7 +66,8 @@ public class CalculationSharingCartService {
             , ActivityQueryDto activityQueryDto
             , String menuType
             , Long deliveryAmount
-            , String opt) {
+            , String opt
+            , String partnerId) {
 
         /**
          * 用促销价格初始化购物车行记录成交价
@@ -86,7 +87,7 @@ public class CalculationSharingCartService {
         /**
          * 买赠
          */
-        giftSharingService.giftResponse(discountResult, cartGoodsList, shoppingCartInfoRequestVo, activityQueryDto);
+        giftSharingService.giftResponse(discountResult, cartGoodsList, shoppingCartInfoRequestVo, activityQueryDto, partnerId);
 
         /**
          * 加价购

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

@@ -50,14 +50,15 @@ public class GiftSharingService {
     public void giftResponse(CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult
             , List<CartGoods> cartGoodsList
             , ShoppingCartInfoRequestVo shoppingCartInfoRequestVo
-            , ActivityQueryDto activityQueryDto) {
+            , ActivityQueryDto activityQueryDto
+            ,String partnerId) {
 
         if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods())) {
             return;
         }
         String menuType = shoppingCartInfoRequestVo == null ? null : shoppingCartInfoRequestVo.getMenuType();
         List<ProductBeanDTO> beanDTOList = this.drawGiftInfo(discountResult, activityQueryDto, menuType);
-        this.setCartGoods(discountResult, cartGoodsList, beanDTOList,shoppingCartInfoRequestVo);
+        this.setCartGoods(discountResult, cartGoodsList, beanDTOList,shoppingCartInfoRequestVo, partnerId);
     }
 
     /**
@@ -120,15 +121,15 @@ public class GiftSharingService {
             , List<CartGoods> cartGoodsLists
             , List<ProductBeanDTO> products
             , ShoppingCartInfoRequestVo shoppingCartInfoRequestVo
-                             ) {
+            , String partnerId                 ) {
 
         if (CollectionUtils.isEmpty(products)) return;
 
         //Map<String, CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> discountForGift = this.getDiscountForGift(discountResult);
 
         List<CartGoods> cartGoodsList = new ArrayList<>();
-        ActiveService activeService = activeFactory.getGifAddCartService(shoppingCartInfoRequestVo);
-        activeService.gifAddCart(cartGoodsLists,cartGoodsList, products,shoppingCartInfoRequestVo,discountResult);
+        ActiveService activeService = activeFactory.getGifAddCartService(partnerId);
+        activeService.gifAddCart(cartGoodsLists,cartGoodsList, products,shoppingCartInfoRequestVo,discountResult,partnerId);
 
         cartGoodsLists.addAll(cartGoodsList);
     }