将小料异常标识在行记录上

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -333,7 +333,7 @@ public class ShoppingCartAdapter {
     }
 
     /**
-     * 单独处理加料
+     * 单独处理加料及标识小料信息是否有变化
      *
      * @param cartGoods
      * @param spuProduct
@@ -343,16 +343,24 @@ public class ShoppingCartAdapter {
         if (CollectionUtils.isEmpty(cartGoods.getProductMaterialList())) return;
         //加料信息为空
         if (CollectionUtils.isEmpty(spuProduct.getAdditionalGroupList())) {
+            cartGoods.setGoodsType(GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType());
             cartGoods.setProductMaterialList(new ArrayList<>());
             return;
         }
         //提取加料信息
+        List<String> materialSpu = new ArrayList<>();
         List<ProductBeanDTO.ProductGroupType.GroupDetailType> groupDetail = spuProduct.getAdditionalGroupList().get(0).getGroupDetail();
         HashMap<String, ProductBeanDTO.ProductGroupType.GroupDetailType> materialHash = new HashMap<>();
         for (ProductBeanDTO.ProductGroupType.GroupDetailType groupDetailType : groupDetail) {
             materialHash.put(groupDetailType.getProductId(), groupDetailType);
+            materialSpu.add(groupDetailType.getProductId());
+        }
+        //加车小料和商品小料没有交集则提示商品信息有异常
+        if(CollectionUtils.isEmpty(cartGoods.getProductMaterialList().stream().filter(e->materialSpu.contains(e.getSpuId())).collect(Collectors.toList()))) {
+            cartGoods.setGoodsType(GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType());
+            cartGoods.setProductMaterialList(new ArrayList<>());
+            return;
         }
-
         ArrayList<CartGoods.MaterialGoods> materialGoodsList = new ArrayList<>();
         Long materialAmount = 0L;
         Long originalMaterAmount = 0L;

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/GoodsTypeEnum.java

@@ -19,7 +19,8 @@ public enum GoodsTypeEnum {
     COUPON_GOODS(2, "商品券"),
     SET_MEAL_GOODS(3,"套餐商品"),
     SKU_GOODS(4, "sku商品"),
-    SPU_GOODS(5, "spu商品");
+    SPU_GOODS(5, "spu商品"),
+    EXCEPTION_GOODS(99, "异常商品:商品菜单变化导致和购物车不商品匹配");
 
     private Integer goodsType;
     private String desc;