赠品选属性后保持规格名称显示

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;