Merge remote-tracking branch 'remotes/origin/feature/1.9.30_买一赠一&第X件Y折' into develop

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

@@ -24,7 +24,6 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * All rights Reserved, Designed By www.freemud.cn
@@ -60,17 +59,37 @@ public class BuySendPromotionService implements IPromotionService {
         if (CollectionUtils.isEmpty(sendActivityList)) {
             return;
         }
-        ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity sendActivity = getSendActivity(sendActivityList, ActivityTypeEnum.TYPE_61);
-        if (sendActivity == null) {
+        //ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity sendActivity = getSendActivity(sendActivityList, ActivityTypeEnum.TYPE_61);
+        //if (sendActivity == null) {
+        //    return;
+        //}
+        //Todo 获取多个赠品list
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> sendActivityLists = getSendActivityList(ActivityTypeEnum.TYPE_61, sendActivityList);
+
+        //Todo 获取多个赠品list
+        if (sendActivityLists.size() == 0) {
             return;
         }
-        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods> sendGoodsList = sendActivity.getSendGoods();
-        if (CollectionUtils.isEmpty(sendGoodsList)) {
-            return;
+
+        //List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods> sendGoodsList = sendActivity.getSendGoods();
+        //if (CollectionUtils.isEmpty(sendGoodsList)) {
+        //    return;
+        //}
+        //Integer maxNum = sendActivity.getMaxNum();
+        //List<String> activitySpuIds = sendGoodsList.stream().map(each -> each.getCategory()).collect(Collectors.toList());
+        //Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods> sendGoodsMap = getSendGoodsMap(sendGoodsList);
+        //Todo
+        List<String> activitySpuIds = new ArrayList<>();
+        Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods> sendGoodsMap = new HashMap<>();
+        Map<String, Integer> maxNums = new HashMap<>();
+        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity activityList : sendActivityLists) {
+            for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGood : activityList.getSendGoods()) {
+                sendGoodsMap.put(sendGood.getCategory(), sendGood);
+                maxNums.put(sendGood.getGoodsId(), activityList.getMaxNum());
+                activitySpuIds.add(sendGood.getGoodsId());
+            }
         }
-        Integer maxNum = sendActivity.getMaxNum();
-        List<String> activitySpuIds = sendGoodsList.stream().map(each -> each.getCategory()).collect(Collectors.toList());
-        Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods> sendGoodsMap = getSendGoodsMap(sendGoodsList);
+        activitySpuIds = activitySpuIds.stream().distinct().collect(Collectors.toList());
         List<CartGoods> newCartGoodsList = new ArrayList<>();
         for (CartGoods cartGood : cartGoodsList) {
             /*if (cartGoodsList.stream().filter(c -> c.getSkuId().equals(cartGood.getSkuId())).count() >= 2){
@@ -92,6 +111,7 @@ public class BuySendPromotionService implements IPromotionService {
         Long givePackAmount = 0L;
         // 优惠商品原总价格
         Long giveTotalAmount = 0L;
+        /*
         for (CartGoods cartGoods : newCartGoodsList) {
             cartGoods.setAmount(0L);
             if (maxNum <= 0) {
@@ -108,10 +128,22 @@ public class BuySendPromotionService implements IPromotionService {
             cartGoods.setOriginalAmount(cartGoods.getOriginalPrice() * cartGoods.getQty());
             cartGoodsList.add(cartGoods);
         }
+        */
+        for (CartGoods cartGoods : newCartGoodsList) {
+            Integer max = maxNums.get(cartGoods.getGoodsId());
+            //if (max <= 0) continue;
+            if (max < cartGoods.getQty()) {
+                cartGoods.setQty(max);
+            }
+            givePackAmount = givePackAmount + cartGoods.getPackPrice() * cartGoods.getQty();
+            giveTotalAmount = giveTotalAmount + cartGoods.getOriginalPrice() * cartGoods.getQty();
+            cartGoods.setOriginalAmount(cartGoods.getOriginalPrice() * cartGoods.getQty());
+            cartGoodsList.add(cartGoods);
+        }
         Integer activityCartQty = cartGoodsList.stream().filter(each -> Objects.equals(each.getActivityType(), ActivityTypeEnum.TYPE_61.getCode())).mapToInt(each -> each.getQty()).sum();
         ActivityTip activityTip = new ActivityTip();
         activityTip.setActivityType(ActivityTypeEnum.TYPE_61.getCode());
-        activityTip.setActivityQty(sendActivity.getMaxNum());
+        //activityTip.setActivityQty(sendActivity.getMaxNum());
         activityTip.setActivityCartQty(activityCartQty);
         activityTip.setActivitySpuIds(activitySpuIds);
         // 当maxNum>=minNum，在加入买一赠一商品时提示“您参加的买赠优惠最多赠送N件哦～”
@@ -178,6 +210,19 @@ public class BuySendPromotionService implements IPromotionService {
     }
 
     /**
+     * 获取指定促销类型的SendActivity
+     *
+     * @param sendActivityList
+     * @param type
+     * @return
+     */
+    private List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> getSendActivityList(ActivityTypeEnum type,
+                                                                                                                    List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> sendActivityList) {
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> collect = sendActivityList.stream().filter(c -> c.getActivityType().equals(type.getCode())).collect(Collectors.toList());
+        return collect;
+    }
+
+    /**
      * 筛选出spu商品中价格最低的商品，Key=spuId
      *
      * @param sendGoodsList

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

@@ -36,36 +36,64 @@ public class XyDiscountServiceImpl implements IPromotionService {
 
     @Override
     public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, UserLoginInfoDto userLoginInfoDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
-        ApportionGoodsDetail apportionGoodsDetail = getApportionGoodsDetail(calculationDiscountResult);
-        if (apportionGoodsDetail != null) {
-            Optional<CartGoods> firstCartGoods = cartGoodsList.stream().filter(cartGoods -> ObjectUtils.equals(apportionGoodsDetail.getGoodsId(), cartGoods.getGoodsId())).findFirst();
-            if (firstCartGoods.isPresent()) {
-                firstCartGoods.get().setAmount(firstCartGoods.get().getAmount() - apportionGoodsDetail.getActivityApportionAmount());
+        //ApportionGoodsDetail apportionGoodsDetail = getApportionGoodsDetail(calculationDiscountResult);
+        //if (apportionGoodsDetail != null) {
+        //    Optional<CartGoods> firstCartGoods = cartGoodsList.stream().filter(cartGoods -> ObjectUtils.equals(apportionGoodsDetail.getGoodsId(), cartGoods.getGoodsId())).findFirst();
+        //    if (firstCartGoods.isPresent()) {
+        //        firstCartGoods.get().setAmount(firstCartGoods.get().getAmount() - apportionGoodsDetail.getActivityApportionAmount());
+        //    }
+        //}
+        List<ApportionGoodsDetail> apportionGoodsDetail = getApportionGoodsDetail(calculationDiscountResult);
+        if (apportionGoodsDetail != null && apportionGoodsDetail.size() > 0) {
+            for (CartGoods cartGoods : cartGoodsList) {
+                for (ApportionGoodsDetail detail : apportionGoodsDetail) {
+                    if (detail.getGoodsId().equals(cartGoods.getGoodsId())) {
+                        cartGoods.setAmount(cartGoods.getAmount() - detail.getActivityApportionAmount());
+                    }
+                }
             }
         }
     }
 
     @Override
     public void updateShoppingCartGoodsApportion(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto, CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
-        ApportionGoodsDetail apportionGoodsDetail = getApportionGoodsDetail(calculationDiscountResult);
-        if (apportionGoodsDetail != null) {
-            Optional<ShoppingCartGoodsDto.CartGoodsDetailDto> firstCartGoods = shoppingCartGoodsDto.getProducts().stream().filter(cartGoods -> ObjectUtils.equals(apportionGoodsDetail.getGoodsId(), cartGoods.getSkuId())).findFirst();
-            if (firstCartGoods.isPresent()) {
-                ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods = firstCartGoods.get();
-                cartGoods.setTotalDiscountAmount(cartGoods.getTotalDiscountAmount() + apportionGoodsDetail.getActivityApportionAmount().intValue());
-                List<ActivityDiscountsDto> activityDiscountsDtoList = new ArrayList<>();
-                ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
-                activityDiscountsDto.setActivityCode(apportionGoodsDetail.getActivityCode());
-                activityDiscountsDto.setActivityName(apportionGoodsDetail.getActivityName());
-                activityDiscountsDto.setActivityType(ActivityTypeEnum.TYPE_104.getCode());
-                activityDiscountsDto.setDiscountAmount(apportionGoodsDetail.getActivityApportionAmount().intValue());
-                activityDiscountsDtoList.add(activityDiscountsDto);
-                cartGoods.setActivityDiscountsDtos(activityDiscountsDtoList);
+        //ApportionGoodsDetail apportionGoodsDetail = getApportionGoodsDetail(calculationDiscountResult);
+        //if (apportionGoodsDetail != null) {
+        //    Optional<ShoppingCartGoodsDto.CartGoodsDetailDto> firstCartGoods = shoppingCartGoodsDto.getProducts().stream().filter(cartGoods -> ObjectUtils.equals(apportionGoodsDetail.getGoodsId(), cartGoods.getSkuId())).findFirst();
+        //    if (firstCartGoods.isPresent()) {
+        //        ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods = firstCartGoods.get();
+        //        cartGoods.setTotalDiscountAmount(cartGoods.getTotalDiscountAmount() + apportionGoodsDetail.getActivityApportionAmount().intValue());
+        //        List<ActivityDiscountsDto> activityDiscountsDtoList = new ArrayList<>();
+        //        ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
+        //        activityDiscountsDto.setActivityCode(apportionGoodsDetail.getActivityCode());
+        //        activityDiscountsDto.setActivityName(apportionGoodsDetail.getActivityName());
+        //        activityDiscountsDto.setActivityType(ActivityTypeEnum.TYPE_104.getCode());
+        //        activityDiscountsDto.setDiscountAmount(apportionGoodsDetail.getActivityApportionAmount().intValue());
+        //        activityDiscountsDtoList.add(activityDiscountsDto);
+        //        cartGoods.setActivityDiscountsDtos(activityDiscountsDtoList);
+        //    }
+        //}
+        List<ApportionGoodsDetail> apportionGoodsDetail = getApportionGoodsDetail(calculationDiscountResult);
+        if (apportionGoodsDetail != null && apportionGoodsDetail.size() > 0) {
+            for (ShoppingCartGoodsDto.CartGoodsDetailDto product : shoppingCartGoodsDto.getProducts()) {
+                for (ApportionGoodsDetail detail : apportionGoodsDetail) {
+                    if (detail.getGoodsId().equals(product.getSkuId())) {
+                        product.setTotalDiscountAmount(product.getTotalDiscountAmount() + detail.getActivityApportionAmount().intValue());
+                        List<ActivityDiscountsDto> activityDiscountsDtoList = new ArrayList<>();
+                        ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
+                        activityDiscountsDto.setActivityCode(detail.getActivityCode());
+                        activityDiscountsDto.setActivityName(detail.getActivityName());
+                        activityDiscountsDto.setActivityType(ActivityTypeEnum.TYPE_104.getCode());
+                        activityDiscountsDto.setDiscountAmount(detail.getActivityApportionAmount().intValue());
+                        activityDiscountsDtoList.add(activityDiscountsDto);
+                        product.setActivityDiscountsDtos(activityDiscountsDtoList);
+                    }
+                }
             }
         }
-
     }
 
+    /*
     private ApportionGoodsDetail getApportionGoodsDetail(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult) {
         // 遍历购物车内的商品，如果存在则进行均摊
         if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getApportionGoods())) {
@@ -87,8 +115,29 @@ public class XyDiscountServiceImpl implements IPromotionService {
         }
         return null;
     }
-
-
+    */
+    private List<ApportionGoodsDetail> getApportionGoodsDetail(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult) {
+        // 遍历购物车内的商品，如果存在则进行均摊
+        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getApportionGoods())) {
+            return null;
+        }
+        List<ApportionGoodsDetail> apportionGoodsDetail = new ArrayList<>();
+        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods apportionGood : calculationDiscountResult.getApportionGoods()) {
+            if (!CollectionUtils.isEmpty(apportionGood.getApportionDetails())) {
+                for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.ApportionDetails apportionDetail : apportionGood.getApportionDetails()) {
+                    if (apportionDetail.getActivityType().equals(ActivityTypeEnum.TYPE_104.getCode())) {
+                        ApportionGoodsDetail detail = new ApportionGoodsDetail();
+                        detail.setActivityApportionAmount(apportionDetail.getActivityApportionAmount());
+                        detail.setActivityCode(apportionDetail.getActivityCode());
+                        detail.setActivityName(apportionDetail.getActivityName());
+                        detail.setGoodsId(apportionGood.getGoodsId());
+                        apportionGoodsDetail.add(detail);
+                    }
+                }
+            }
+        }
+        return apportionGoodsDetail;
+    }
     @Data
     private class ApportionGoodsDetail {
         /**