小料多数量时行比较要考虑数量

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

@@ -451,7 +451,8 @@ public class CartGoods {
             }
         }
         if (CollectionUtils.isNotEmpty(productMaterialList)) {
-            productMaterialList.stream().sorted(Comparator.comparing(MaterialGoods::getSpuId)).forEach(e -> originalString.append(e.getSpuId()));
+            // 小料的数量也要比较
+            productMaterialList.stream().sorted(Comparator.comparing(MaterialGoods::getSpuId)).forEach(e -> {originalString.append(e.getSpuId());originalString.append(e.getQty());});
         }
         if (CollectionUtils.isNotEmpty(specialExtra)) {
             specialExtra.stream().sorted(Comparator.comparing(SpecialExtra::getAttributeId)).forEach(e -> originalString.append(e.getAttributeId()));
@@ -487,7 +488,7 @@ public class CartGoods {
             }
         }
         if (CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())) {
-            cartGoods.getProductMaterialList().stream().sorted(Comparator.comparing(MaterialGoods::getSpuId)).forEach(e -> currentString.append(e.getSpuId()));
+            cartGoods.getProductMaterialList().stream().sorted(Comparator.comparing(MaterialGoods::getSpuId)).forEach(e -> {currentString.append(e.getSpuId());currentString.append(e.getQty());});
         }
         if (CollectionUtils.isNotEmpty(cartGoods.getSpecialExtra())) {
             cartGoods.getSpecialExtra().stream().sorted(Comparator.comparing(SpecialExtra::getAttributeId)).forEach(e -> currentString.append(e.getAttributeId()));