Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞

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

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

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

@@ -77,16 +77,17 @@ public class CocoActiveServiceImpl implements ActiveService {
                            List<ProductBeanDTO> products ,
                            ShoppingCartInfoRequestVo shoppingCartInfoRequestVo,
                            CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult,
-                           String partnerId) {
+                           String partnerId,
+                           Integer flag) {
 
         // 点餐页赠品分行显示，赠品显示小料
         // 结束页赠品合并到主商品行
         // 创单查询购物车分行显示
         Map<String, CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> discountForGift = this.getDiscountForGift(discountResult);
-        if(ObjectUtils.equals(partnerId,1)){//结算页
+        if(ObjectUtils.equals(flag,1)){//结算页
             for(CartGoods cgs : oldcartGoodsLists){
                 if(null == discountForGift.get(cgs.getCartGoodsUid())){
-                    break;
+                    continue;
                 }
 
                 CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods gift = discountForGift.get(cgs.getCartGoodsUid());
@@ -97,11 +98,11 @@ public class CocoActiveServiceImpl implements ActiveService {
         }else{
             for(CartGoods cgs : oldcartGoodsLists){
                 if(null == discountForGift.get(cgs.getCartGoodsUid())){
-                    break;
+                    continue;
                 }
 
                 if(null == discountForGift.get(cgs.getCartGoodsUid()).getDiscounts() || discountForGift.get(cgs.getCartGoodsUid()).getDiscounts().isEmpty()){
-                    break;
+                    continue;
                 }
 
                 CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount = discountForGift.get(cgs.getCartGoodsUid()).getDiscounts()
@@ -145,6 +146,7 @@ public class CocoActiveServiceImpl implements ActiveService {
                 newCartGoods.setClassificationId(cgs.getClassificationId());
                 newCartGoods.setClassificationName(cgs.getClassificationName());
                 newCartGoods.setActivityType(discount.getType());
+                newCartGoods.setQty(discountForGift.get(cgs.getCartGoodsUid()).getGoodsQuantity());
                 addcartGoodsList.add(newCartGoods);
             }
         }

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

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

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

@@ -334,7 +334,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , menuType
                     , deliveryAmount
                     , ShoppingCartConstant.ADD_AND_UPDATE
-                    , partnerId);
+                    , partnerId
+                    , null);
 
             buildDiscounts(shoppingCartGoodsResponseVo,discountResult);
         }
@@ -459,7 +460,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , menuType
                     , deliveryAmount
                     , ShoppingCartConstant.ADD_AND_UPDATE
-                    , partnerId);
+                    , partnerId
+                    , null);
 
             buildDiscounts(shoppingCartGoodsResponseVo,discountResult);
         }
@@ -629,7 +631,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , menuType
                     , deliveryAmount
                     , ShoppingCartConstant.QUERY_INFO
-                    , partnerId);
+                    , partnerId
+                    ,shoppingCartInfoRequestVo.getFlag());
 
             buildDiscounts(shoppingCartGoodsResponseVo,calculationSharingDiscountResult);
         }

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

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

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

@@ -51,14 +51,15 @@ public class GiftSharingService {
             , List<CartGoods> cartGoodsList
             , ShoppingCartInfoRequestVo shoppingCartInfoRequestVo
             , ActivityQueryDto activityQueryDto
-            ,String partnerId) {
+            , String partnerId
+            , Integer flag) {
 
         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, partnerId);
+        this.setCartGoods(discountResult, cartGoodsList, beanDTOList,shoppingCartInfoRequestVo, partnerId, flag);
     }
 
     /**
@@ -121,7 +122,8 @@ public class GiftSharingService {
             , List<CartGoods> cartGoodsLists
             , List<ProductBeanDTO> products
             , ShoppingCartInfoRequestVo shoppingCartInfoRequestVo
-            , String partnerId                 ) {
+            , String partnerId
+            , Integer flag) {
 
         if (CollectionUtils.isEmpty(products)) return;
 
@@ -129,7 +131,7 @@ public class GiftSharingService {
 
         List<CartGoods> cartGoodsList = new ArrayList<>();
         ActiveService activeService = activeFactory.getGifAddCartService(partnerId);
-        activeService.gifAddCart(cartGoodsLists,cartGoodsList, products,shoppingCartInfoRequestVo,discountResult,partnerId);
+        activeService.gifAddCart(cartGoodsLists,cartGoodsList, products,shoppingCartInfoRequestVo,discountResult,partnerId,flag);
 
         cartGoodsLists.addAll(cartGoodsList);
     }