Merge branch 'feature-yu.sun-material-20201030' into qa

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

@@ -66,6 +66,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -857,6 +858,9 @@ public class ShoppingCartMCoffeeServiceImpl {
                 comboProducts.forEach(combo -> {
                     getComboxGoods(cartGoods, combo, orderItemList);
                 });
+                //取所有固定套餐的价格计算套餐总价
+                Long originalPrice = comboProducts.stream().filter(orderItemResp -> null != orderItemResp.getProductPrice()).mapToLong(orderItemResp ->orderItemResp.getProductPrice().longValue()).sum();
+                cartGoods.setOriginalPrice(originalPrice);
             }
             //特制
             if (StringUtils.isNotEmpty(orderItem.getExtInfo())){