定制属性不一致商品非同一个商品

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java

@@ -345,6 +345,9 @@ public class CartGoods {
             if (CollectionUtils.isNotEmpty(extra)) {
                 extra.stream().sorted(Comparator.comparing(CartGoodsExtra::getAttributeId)).forEach(e -> sb.append(e.getAttributeId()));
             }
+            if (CollectionUtils.isNotEmpty(specialExtra)) {
+                specialExtra.stream().sorted(Comparator.comparing(SpecialExtra::getAttributeId)).forEach(e -> sb.append(e.getAttributeId()));
+            }
             return sb.toString();
         }
     }
@@ -366,6 +369,9 @@ public class CartGoods {
         if (CollectionUtils.isNotEmpty(productComboList)) {
             for (ComboxGoods goods : productComboList) {
                 originalString.append(goods.toString());
+                if (CollectionUtils.isNotEmpty(goods.getSpecialExtra())) {
+                    goods.getSpecialExtra().stream().sorted(Comparator.comparing(SpecialExtra::getAttributeId)).forEach(e -> originalString.append(e.getAttributeId()));
+                }
             }
         }
         if (CollectionUtils.isNotEmpty(productGroupList)) {
@@ -376,6 +382,9 @@ public class CartGoods {
         if (CollectionUtils.isNotEmpty(productMaterialList)) {
             productMaterialList.stream().sorted(Comparator.comparing(MaterialGoods::getSpuId)).forEach(e -> originalString.append(e.getSpuId()));
         }
+        if (CollectionUtils.isNotEmpty(specialExtra)) {
+            specialExtra.stream().sorted(Comparator.comparing(SpecialExtra::getAttributeId)).forEach(e -> originalString.append(e.getAttributeId()));
+        }
         //当前字符串
         CartGoods cartGoods = (CartGoods) o;
 
@@ -388,6 +397,9 @@ public class CartGoods {
         if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList())) {
             for (ComboxGoods goods : cartGoods.getProductComboList()) {
                 currentString.append(goods.toString());
+                if (CollectionUtils.isNotEmpty(goods.getSpecialExtra())) {
+                    goods.getSpecialExtra().stream().sorted(Comparator.comparing(SpecialExtra::getAttributeId)).forEach(e -> currentString.append(e.getAttributeId()));
+                }
             }
         }
         if (CollectionUtils.isNotEmpty(cartGoods.getProductGroupList())) {
@@ -398,6 +410,9 @@ public class CartGoods {
         if (CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())) {
             cartGoods.getProductMaterialList().stream().sorted(Comparator.comparing(MaterialGoods::getSpuId)).forEach(e -> currentString.append(e.getSpuId()));
         }
+        if (CollectionUtils.isNotEmpty(cartGoods.getSpecialExtra())) {
+            cartGoods.getSpecialExtra().stream().sorted(Comparator.comparing(SpecialExtra::getAttributeId)).forEach(e -> currentString.append(e.getAttributeId()));
+        }
         return StringUtils.equals(originalString.toString(), currentString.toString());
     }