sunyu::conflicts::fix bug about combo-product price calculate

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

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