Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into qa

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2372,6 +2372,9 @@ public class OrderAdapter {
                 List<CreateOrderProductRequest> comboProducts = new ArrayList<>();
                 cartGoodsDetailDto.getComboProducts().forEach(product -> {
                     CreateOrderProductRequest createOrderComboProduct = convent2MCCafeOrderProductDemo(product, product.getProductType());
+                    if(!product.getIsFixedProduct()) {
+                        createOrderProductDemoDto.setPrice(createOrderProductDemoDto.getPrice()+product.getOriginalPrice());
+                    }
                     comboProducts.add(createOrderComboProduct);
                     if(CollectionUtils.isNotEmpty(product.getMaterialList())) {
                         //加料商品