对接促销算价Alpha->fix

shopping-cart-application-service/src/main/java/cn/freemud/enums/ProductType.java

@@ -19,8 +19,8 @@ public enum ProductType {
     HAVESPEC(10, "有规格"),
     WEIGHT_PRODUCT(11, "称重商品"),
     TABLEWARE_PRODUCT(12, "餐具商品"),
-    SETMEAL(6,"套餐");
-
+    SETMEAL(6, "套餐"),
+    MATERIAL(88, "有加料的商品");
     private int code;
 
     private String desc;

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

@@ -381,7 +381,7 @@ public class CalculationCommonService {
                 }
                 materialList.add(goods);
             }
-            cartGoodsDetailDto.setProductType(GoodsTypeEnum.MATERIAL.getGoodsType());
+            cartGoodsDetailDto.setProductType(ProductType.MATERIAL.getCode());
             cartGoodsDetailDto.setMaterialList(materialList);
         }
         /**
@@ -393,7 +393,7 @@ public class CalculationCommonService {
             HashMap<String, BlockRow> gxDiscount = this.drawnSmallAndGroupRow(calculationGoods, 2, true);
             List<ShoppingCartGoodsDto.CartGoodsDetailDto> comboLists = this.com2DetailGoods(gxDiscount, cartGoods.getProductComboList(), cartGoods, true);
             combs.addAll(comboLists);
-            cartGoodsDetailDto.setProductType(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType());
+            cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
         }
         /**
          * 可选商品