sunyu::new function about material

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

@@ -467,6 +467,10 @@ public class CartGoods {
          */
         private String spuId;
         /**
+         * 加料组id(对应入机键位)
+         */
+        private String groupId;
+        /**
          * 加料名称
          */
         private String spuName;

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

@@ -20,4 +20,12 @@ public class MaterialRequestVo {
      * 加料商品ID
      */
     private String spuId;
+    /**
+     * 加料组ID(对应入机键位)
+     */
+    private String groupId;
+    /**
+     * 加料数量
+     */
+    private int qty;
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -76,6 +76,8 @@ public class CalculationServiceImpl {
     private SetMealCalculation setMealCalculation;
 
     @Autowired
+    private MaterialCalculation materialCalculation;
+    @Autowired
     private ShoppingCartConvertAdapter shoppingCartConvertAdapter;
 
     /**
@@ -105,6 +107,8 @@ public class CalculationServiceImpl {
         //套餐
         setMealCalculation.updateShoppingCartGoodsDiscount(calculationDiscount,cartGoodsList,shoppingCartGoodsResponseVo);
 
+        //加料
+        materialCalculation.updateShoppingCartGoodsApportion(calculationDiscount,cartGoodsList);
         return calculationDiscount;
     }