修复新算价多赠品多送问题

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

@@ -88,15 +88,15 @@ public class PlatformActiveServiceImpl implements ActiveService {
                            Integer flag) {
 
         Map<String, Goods> discountForGift = this.getDiscountForGift(discountResult);
-        discountForGift.forEach((pid, goods) -> {
+        List<CartGoods> list = new ArrayList<>();
+        for (ProductBean product : products) {
+            Goods goods = discountForGift.get(product.getPid());
             GoodsDiscount discount = goods.getDiscounts()
                     .stream()
                     .filter(g -> ActivityTypeEnum.TYPE_63.getCode().equals(g.getType()) ||ActivityTypeEnum.TYPE_62.getCode().equals(g.getType()) || ActivityTypeEnum.TYPE_61.getCode().equals(g.getType()) ||  ActivityTypeEnum.TYPE_230.getCode().equals(g.getType()))
                     .findFirst()
                     .get();
 
-            List<CartGoods> list = new ArrayList<>();
-            for (ProductBean product : products) {
             CartGoods cartGood = new CartGoods();
             cartGood.setGoodsId(goods.getGoodsId());
             cartGood.setGoodsType(1);
@@ -125,8 +125,7 @@ public class PlatformActiveServiceImpl implements ActiveService {
             list.addAll(buyAndGiftsPromotionService.setGiftExtra(cartGood, product, addcartGoodsList));
         }
         // 因为有涉及到用户选择的属性，存入redis
-            addcartGoodsList.addAll(giftCacheManager.resetGiftCache(list, discount.getActivityCode(), partnerId, storeId, userId));
-        });
+        addcartGoodsList.addAll(giftCacheManager.resetGiftCache(list, null, partnerId, storeId, userId));
     }
 
     public Map<String, Goods> getDiscountForGift(CalculationDiscountResult discountResult) {