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

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/CalculationSharingDiscountResponseDto.java

@@ -175,6 +175,11 @@ public class CalculationSharingDiscountResponseDto {
         public static class Goods {
 
             /**
+             * 买一赠一时，存赠送主商品的cartGoodsUid 用于标记是那个商品送的
+             */
+            private String originalGoodsUid;
+
+            /**
              * 购物车行记录
              */
             private String cartGoodsUid;
@@ -368,6 +373,12 @@ public class CalculationSharingDiscountResponseDto {
 
             @Data
             public static class SendGoods {
+
+                /**
+                 * 买一赠一时，存赠送主商品的cartGoodsUid 用于标记是那个商品送的
+                 */
+                private String originalGoodsUid;
+
                 /**
                  * 赠送商品ID
                  */

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

@@ -201,6 +201,51 @@ public class BuyOneGiveOneSendService {
      */
     private void buildSendGoods(CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult,ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo,ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
 
+        // 赠送、换购商品信息集合
+        List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.SendActivity> sendGoods = discountResult.getSendGoods();
+        if(sendGoods == null || sendGoods.isEmpty()){
+            return;
+        }
+
+        // 抽取买一赠一寄件活动送的商品
+        List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.SendActivity> buyOneGiveOneSendGoods = sendGoods
+                .stream()
+                .filter(sendGood -> ObjectUtils.equals(sendGood.getActivityType(),ActivityTypeEnum.TYPE_63.getCode()))
+                .collect(Collectors.toList());
+
+        if(null == buyOneGiveOneSendGoods || buyOneGiveOneSendGoods.isEmpty()){
+            return;
+        }
+
+        List<ShoppingCartGoodsResponseVo.chooseGood> chooseGoods = shoppingCartGoodsResponseVo.getChooseGoods() == null ? new ArrayList<>() : shoppingCartGoodsResponseVo.getChooseGoods();
+        buyOneGiveOneSendGoods.forEach(sendActivity ->{
+
+            // 这个是真正的送的券
+            List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods> innerSendGoods = sendActivity.getSendGoods();
+            if(innerSendGoods == null || innerSendGoods.isEmpty()){
+                return;
+            }
+
+            innerSendGoods.forEach(innerSendGood -> {
+                ShoppingCartGoodsResponseVo.chooseGood  chooseGood = new ShoppingCartGoodsResponseVo.chooseGood();
+                chooseGood.setActiveCode(sendActivity.getActivityCode());
+                chooseGood.setActiveType(sendActivity.getActivityType());
+                chooseGood.setGoodsId(innerSendGood.getGoodsId());
+                chooseGood.setQty(innerSendGood.getSendNumber());
+                chooseGood.setCouponQty(1);
+                chooseGood.setCartGoodsUid(innerSendGood.getOriginalGoodsUid());
+                chooseGood.setCouponCode(innerSendGood.getSendCouponCode());
+                chooseGood.setCouponName(innerSendGood.getSendCouponName());
+                chooseGood.setSendCoupon(innerSendGood.getSendCoupon());
+                chooseGood.setGoodsName(innerSendGood.getGoodsName());
+                chooseGoods.add(chooseGood);
+            });
+
+        });
+
+        shoppingCartGoodsResponseVo.setChooseGoods(chooseGoods);
+
+        /*
         List<ShoppingCartGoodsResponseVo.chooseGood> chooseGoods = shoppingCartGoodsResponseVo.getChooseGoods() == null ? new ArrayList<>() : shoppingCartGoodsResponseVo.getChooseGoods();
 
 
@@ -277,7 +322,7 @@ public class BuyOneGiveOneSendService {
             });
         });
 
-        shoppingCartGoodsResponseVo.setChooseGoods(chooseGoods);
+        shoppingCartGoodsResponseVo.setChooseGoods(chooseGoods);*/
 
     }
 

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

@@ -125,7 +125,7 @@ public class GiftSharingService {
             CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods goods = discountForGift.get(k);
             CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount = goods.getDiscounts()
                     .stream()
-                    .filter(g -> ActivityTypeEnum.TYPE_62.getCode().equals(g.getType()) || ActivityTypeEnum.TYPE_61.getCode().equals(g.getType()))
+                    .filter(g -> ActivityTypeEnum.TYPE_63.getCode().equals(g.getType()) ||ActivityTypeEnum.TYPE_62.getCode().equals(g.getType()) || ActivityTypeEnum.TYPE_61.getCode().equals(g.getType()))
                     .findFirst()
                     .get();
             CartGoods cartGood = new CartGoods();