Merge remote-tracking branch 'origin/master'

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

@@ -95,6 +95,7 @@ public class PlatformActiveServiceImpl implements ActiveService {
                     .get();
             CartGoods cartGood = new CartGoods();
             cartGood.setGoodsId(goods.getGoodsId());
+            cartGood.setOriginalGoodsUid(goods.getOriginalGoodsUid());
             cartGood.setGoodsType(1);
             cartGood.setSpuId(Objects.equals(product.getIsSkuProduct(), 1) ? product.getSpecProductId() : goods.getGoodsId());
             cartGood.setSkuId(goods.getGoodsId());
@@ -118,7 +119,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/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());

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) {

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

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author Clover.z
@@ -49,7 +50,14 @@ public class CartGiftServiceImpl implements CartGiftService {
             nameList.add(a.getAttributeName());
         });
         goods.setExtra(attrList);
-        goods.setSubName(StringUtils.join(nameList, "/"));
+        // 多规格赠品，需要带上规格name
+        String skuName = Optional.ofNullable(goods.getSkuName()).orElse("");
+        String spuName = Optional.ofNullable(goods.getSpuName()).orElse("");
+        String skuPreName = "";
+        if (skuName.length() > spuName.length()+1) {
+            skuPreName = skuName.substring(spuName.length() + 1) + "/";
+        }
+        goods.setSubName(skuPreName + StringUtils.join(nameList, "/"));
         // 更新赠品缓存
         giftCacheManager.updateGiftGoods(partnerId, storeCode, user.getMemberId(), goods);
         return goods;