Merge branch '20210817-满M件N折活动支持-zhiwei.zha' into pre

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ShoppingCartPromotionEnum.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1554,6 +1554,9 @@ public class OrderSdkAdapter {
             case "SINGLE_PRODUCT_REDUCTION":
                 type = 22;
                 break;
+            case "FULL_M_COUNT_N_FOLD":
+                type = 83;
+                break;
             default:
                 break;
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java

@@ -50,6 +50,7 @@ public enum OldOrderAccountType {
     MEMBER_PRICE_DISCOUNT(220, "会员价优惠", "MEMBER_PRICE_DISCOUNT"),
     COCO_PRODUCT_CASH_COUPON(36, "coco商品代金券","COCO_PRODUCT_CASH_COUPON"),
     FULL_BUYM_SENDN(230, "满赠","FULL_BUYM_SENDN"),
+    FULL_M_COUNT_N_FOLD(83, "满M件N折", "FULL_M_COUNT_N_FOLD"),
     SINGLE_PRODUCT_REDUCTION(22, "单品立减","SINGLE_PRODUCT_REDUCTION");
     private Integer code;
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java

@@ -49,6 +49,7 @@ public enum QueryOrderAccountType {
     WITH_ORDER_BUY_COUPON_FEE("WITH_ORDER_BUY_COUPON_FEE", "随单买月卡"),
     COCO_PRODUCT_CASH_COUPON("COCO_PRODUCT_CASH_COUPON", "coco商品代金券"),
     FULL_BUYM_SENDN("FULL_BUYM_SENDN", "满赠"),
+    FULL_M_COUNT_N_FOLD("FULL_M_COUNT_N_FOLD", "满M件N折"),
     SINGLE_PRODUCT_REDUCTION("SINGLE_PRODUCT_REDUCTION", "单品立减")
     ;
     private String code;

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2944,6 +2944,9 @@ public class OrderAdapter {
         if (ActivityTypeEnum.TYPE_231.getCode().equals(activityType)) {
             return OldOrderAccountType.MONTH_CARD_TOTAL_DISCOUNT;
         }
+        if (ActivityTypeEnum.TYPE_83.getCode().equals(activityType)) {
+            return OldOrderAccountType.FULL_M_COUNT_N_FOLD;
+        }
         return OldOrderAccountType.BUYM_SENDN;
     }
 

order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -19,6 +19,7 @@ public enum ActivityTypeEnum {
     TYPE_13(13, "新用户立减"),
     TYPE_14(14, "满减配送费"),
     TYPE_104(104,"x件y折"),
+    TYPE_83(83, "满M件N折"),
     /**
      * 限时特价
      */

shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -53,6 +53,10 @@ public enum ActivityTypeEnum {
     TYPE_7(7, "满额赠券"),
     TYPE_8(8, "满N件换购"),
     /**
+     * 满M件N折
+     */
+    TYPE_83(83, "满M件N折"),
+    /**
      * 加价购
      */
     TYPE_81(81, "满额换购"),

shopping-cart-application-service/src/main/java/cn/freemud/enums/ShoppingCartPromotionEnum.java

@@ -29,7 +29,9 @@ public enum ShoppingCartPromotionEnum {
     // 集点活动类
     GATHER_SPOT(13, "gatherSpotPromotionService"),
     BUY_M_SEND_N_COUPON(14, "buyMSendNCouponDiscountService"),
-    MEMBER_DISCOUNT_NEw(27, "memberDiscountService");
+    MEMBER_DISCOUNT_NEw(27, "memberDiscountService"),
+    FULL_M_COUNT_N_FOLD(83, "FullMCountNFoldPromotionService"),
+    ;
 
     private Integer type;
     private String msgType;

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

+package cn.freemud.service.impl;
+
+import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
+import cn.freemud.entities.dto.UserLoginInfoDto;
+import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
+import cn.freemud.entities.dto.activity.ActivityQueryDto;
+import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
+import cn.freemud.entities.vo.*;
+import cn.freemud.enums.ActivityTypeEnum;
+import cn.freemud.service.IPromotionService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author Clover.z
+ * @Date 2021/8/18
+ * @Desc 满M件N折活动优惠计算
+ */
+@Service("FullMCountNFoldPromotionService")
+public class FullMCountNFoldPromotionService implements IPromotionService {
+
+    @Override
+    public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, UserLoginInfoDto userLoginInfoDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
+        if (! assertHasDiscount(calculationDiscountResult)) return;
+
+        // 转换一下结构，方便匹配购物车商品的活动信息
+        Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> map = calculationDiscountResult.getGoods().stream()
+                .collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getCartGoodsUid, Function.identity(), (k1, k2) -> k1));
+        // 匹配购物车行，设置优惠价格
+        cartGoodsList.forEach(cartGoods -> {
+            ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods discountGoods = map.get(cartGoods.getCartGoodsUid());
+            if (null != discountGoods && CollectionUtils.isNotEmpty(discountGoods.getDiscounts())) {
+                ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount = getDiscount(discountGoods.getDiscounts());
+                Long originPrice = cartGoods.getFinalPrice() * cartGoods.getQty();
+                cartGoods.setAmount(originPrice - discount.getDiscount());
+                cartGoods.setActivityNumber(discount.getActualGoodsNumber());
+            }
+        });
+    }
+
+    @Override
+    public void updateShoppingCartGoodsApportion(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto, CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
+        if (! assertHasDiscount(calculationDiscountResult)) return;
+
+        // 转换一下结构，方便匹配购物车商品的活动信息
+        Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> map = calculationDiscountResult.getGoods().stream()
+                .collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getCartGoodsUid, Function.identity(), (k1, k2) -> k1));
+
+        for (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods : shoppingCartGoodsDto.getProducts()) {
+            ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods discountGoods = map.get(cartGoods.getCartGoodsUid());
+            if (null != discountGoods && CollectionUtils.isNotEmpty(discountGoods.getDiscounts())) {
+                ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount = getDiscount(discountGoods.getDiscounts());
+
+                ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
+                activityDiscountsDto.setActivityCode(discount.getActivityCode());
+                activityDiscountsDto.setActivityName(discount.getActivityName());
+                activityDiscountsDto.setActivityType(ActivityTypeEnum.TYPE_83.getCode());
+                activityDiscountsDto.setDiscountAmount(discount.getDiscount().intValue());
+                cartGoods.getActivityDiscountsDtos().add(activityDiscountsDto);
+                cartGoods.setTotalDiscountAmount(cartGoods.getTotalDiscountAmount() + discount.getDiscount().intValue());
+            }
+        }
+    }
+
+    /**
+     * 判断是否符合优惠
+     * @param calculationDiscountResult
+     * @return
+     */
+    private boolean assertHasDiscount(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult) {
+        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts()))
+            return false;
+
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discountList
+                = calculationDiscountResult.getDiscounts().stream().filter(discount -> ActivityTypeEnum.TYPE_83.getCode().equals(discount.getType())).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(discountList))
+            return false;
+
+        return true;
+    }
+
+
+    /**
+     * 返回商品参与的满M件N折的活动信息
+     * @param goodsDiscounts
+     * @return
+     */
+    private ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount getDiscount(List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> goodsDiscounts) {
+        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : goodsDiscounts) {
+            if (ActivityTypeEnum.TYPE_83.getCode().equals(discount.getType())) {
+                return discount;
+            }
+        }
+        return null;
+    }
+}

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

@@ -1792,6 +1792,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 twoNDiscountService.updateShoppingCartGoodsDiscount(couponPromotionVO, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo);
             }
         }
+
+        // 满M件N折活动
+        IPromotionService fullMCountNFoldService = PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.FULL_M_COUNT_N_FOLD);
+        fullMCountNFoldService.updateShoppingCartGoodsDiscount(couponPromotionVO, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo);
+
         // 买赠活动
         BuyAndGiftsPromotionService buyAndGiftsPromotionService = (BuyAndGiftsPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.BUY_GIFTS);
         buyAndGiftsPromotionService.updateShoppingCartGoodsDiscount(couponPromotionVO, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo);
@@ -1978,6 +1983,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
          */
         MaterialPromotionService materialPromotionService = (MaterialPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.Material);
         materialPromotionService.updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscountResult, shoppingCartGoodsDto, premiumExchangeActivity, shoppingCartInfoRequestVo);
+
+        // 满M件N折活动
+        IPromotionService fullMCountNFoldService = PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.FULL_M_COUNT_N_FOLD);
+        fullMCountNFoldService.updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscountResult, shoppingCartGoodsDto, premiumExchangeActivity, shoppingCartInfoRequestVo);
+
     }