Merge branch '20211203-买一赠一赠品属性优化-zhiwei.zha' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/cache/GiftCacheManager.java

@@ -66,7 +66,9 @@ public class GiftCacheManager {
             while (it.hasNext()) {
                 CartGoods old = it.next();
                 boolean isSameType = StringUtils.isBlank(activityCode) || activityCode.equals(old.getActivityCode());
-                if (! old.getGoodsId().equals(gift.getGoodsId()) || ! isSameType) continue;
+                // 买赠活动，多个不同属性的同一商品，赠品属性不能乱
+                boolean oriSource = StringUtils.isBlank(gift.getOriginalGoodsUid()) || gift.getOriginalGoodsUid().equals(old.getOriginalGoodsUid());
+                if (! old.getGoodsId().equals(gift.getGoodsId()) || ! isSameType || !oriSource) continue;
                 // 赠品匹配上了，copy赠品属性
                 gift.setExtra(old.getExtra());
                 gift.setSubName(old.getSubName());