Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa'

Update BuyAndGiftsPromotionService.java

See merge request !86

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

@@ -93,6 +93,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
                 cartGoods.setClassificationName(product.getCategoryName());
                 // nodeId标识activeCode,用于计算均摊时每个商品在每个活动上均摊金额
                 cartGoods.setNodeId(sendActivity.getActivityCode());
+                cartGoods.setOriginalGoodsUid(sendGoods.getOriginalGoodsUid());
                 this.setGiftExtra(cartGoods,product,cartGoodsList);
                 cartGoodsList.add(cartGoods);
                 totalGiftAmount += product.getFinalPrice() * sendGoods.getSendNumber();
@@ -170,7 +171,10 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
         long count = cartGoodsList.stream().filter(c -> c.getSpuId().equals(cartGoods.getSpuId())).count();
         //购物车内存在同类
         if (count>0) {
-            CartGoods find = cartGoodsList.stream().filter(c -> c.getSpuId().equals(cartGoods.getSpuId())).findFirst().get();
+            CartGoods find = cartGoodsList.stream().filter(c -> c.getCartGoodsUid().equals(cartGoods.getOriginalGoodsUid())).findFirst().orElse(null);
+            if (null == find) {
+                find = cartGoodsList.stream().filter(c -> c.getSpuId().equals(cartGoods.getSpuId())).findFirst().get();
+            }
             cartGoods.setExtra(find.getExtra());
             cartGoods.setSpuName(find.getSpuName());
             cartGoods.setSkuName(find.getSkuName());