买一赠一时，赠品属性和原商品保持一致

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

@@ -118,7 +118,7 @@ public class PlatformActiveServiceImpl implements ActiveService {
             cartGood.setClassificationName(product.getCategoryName());
             // nodeId标识activeCode,用于计算均摊时每个商品在每个活动上均摊金额
             cartGood.setNodeId(discount.getActivityCode());
-            list.addAll(buyAndGiftsPromotionService.setGiftExtra(cartGood, product, addcartGoodsList));
+            list.addAll(buyAndGiftsPromotionService.setGiftExtra(cartGood, product, oldcartGoodsLists));
         }
         // 因为有涉及到用户选择的属性，存入redis
         addcartGoodsList.addAll(giftCacheManager.resetGiftCache(list, null, partnerId, storeId, userId));

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

@@ -218,7 +218,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
         List<CartGoods> result = new ArrayList<>();
         result.add(cartGoods);
 
-        //购物车内存在同类
+        // 买一赠一时，赠品属性和原商品保持一致
         if (null != cartGoodsList && cartGoodsList.stream().filter(c -> c.getSpuId().equals(cartGoods.getSpuId())).count() > 0) {
             CartGoods find = cartGoodsList.stream().filter(c -> c.getCartGoodsUid().equals(cartGoods.getOriginalGoodsUid())).findFirst().orElse(null);
             if (null == find) {