Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa

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

@@ -1747,6 +1747,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                     if(ObjectUtils.equals(productType.getPid(), cartGoods.getSpuId())){
                         //多规格商品更新套餐价格为商品返回
                         cartGoods.setFinalPrice(valiadShopProductResult.getProductType().getFinalPrice());
+                        cartGoods.setOriginalPrice(valiadShopProductResult.getProductType().getFinalPrice());
                         Map<String,ProductTypeBeanDTO> subProductTypeMap = valiadShopProductResult.getSubProductTypeMap();
                         shoppingCartConvertAdapter.updateCartGoodsInfo(cartGoods, productType,subProductTypeMap);
                         break;