Merge branches 'feature-yu.sun-material-20201030' and 'qa' of…

Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -473,8 +473,9 @@ public class CalculationServiceImpl {
             totalOriginalAmount += originalAmount;
             totalAmount += amount;
             totalPackgeAmount += packAmount;
-            cartGoods.setOriginalAmount(originalAmount);
-            cartGoods.setAmount(amount);
+            long materialPrice = getMaterialPrice(cartGoods);
+            cartGoods.setOriginalAmount(originalAmount + materialPrice);
+            cartGoods.setAmount(amount + materialPrice);
             cartGoods.setPackPrice(packAmount);
         }
         shoppingCartGoodsResponseVo.setOriginalTotalAmount(calculationDiscount == null ? totalOriginalAmount : calculationDiscount.getOriginalTotalAmount());
@@ -489,4 +490,17 @@ public class CalculationServiceImpl {
         shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscount == null ? 0L :calculationDiscount.getDistributionFee());
     }
 
+
+    private Long getMaterialPrice(CartGoods cartGoods){
+        Long materialPrice = 0L;
+        //单品、多规格加料
+        if(CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())){
+            for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()){
+                materialPrice+= materialGoods.getFinalPrice() * cartGoods.getQty();
+            }
+        }
+        return materialPrice;
+    }
+
+
 }

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

@@ -69,9 +69,22 @@ public class SetMealCalculation {
             long productComboAmount = cartGoods.getProductComboList().stream().mapToLong(t -> t.getFinalPrice() * t.getQty()).sum();
             long productComboTotalAmount = productComboAmount * cartGoods.getQty();
 
-            cartGoods.setOriginalAmount(productGroupTotalAmount + productComboTotalAmount);
+            long materialPrice = 0l;
+            //套餐固定商品加料
+            if(CollectionUtils.isNotEmpty(cartGoods.getProductComboList())){
+                for (CartGoods.ComboxGoods comboxGoods : cartGoods.getProductComboList()){
+                    Long comboxmaterialPrice = 0L;
+                    for (CartGoods.MaterialGoods materialGoods : comboxGoods.getProductMaterialList()){
+                        comboxmaterialPrice+= materialGoods.getFinalPrice() * cartGoods.getQty();
+                    }
+                    comboxGoods.setAmount(comboxGoods.getAmount()+comboxmaterialPrice);
+                    materialPrice = materialPrice + comboxmaterialPrice;
+                }
+            }
+
+            cartGoods.setOriginalAmount(productGroupTotalAmount + productComboTotalAmount + materialPrice);
             cartGoods.setOriginalPrice(productComboTotalAmount);
-            cartGoods.setAmount(productGroupTotalAmount + productComboTotalAmount);
+            cartGoods.setAmount(productGroupTotalAmount + productComboTotalAmount + materialPrice);
             cartGoods.setFinalPrice(productComboTotalAmount);
 
             // 套餐（固定商品）现价