加料

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

@@ -2186,16 +2186,17 @@ public class OrderAdapter {
                     }
                 });
                 createOrderProductDemoDto.setComboProduct(comboProducts);
-            } else if(CollectionUtils.isNotEmpty(cartGoodsDetailDto.getMaterialList())) {
-                //加料商品
-                createOrderProductDemoDto.setProductType(ProductType.MATERIALPRODUCT_UPPRICE.getCode());
-                List<CreateOrderProductRequest> materialProducts = new ArrayList<>();
-                cartGoodsDetailDto.getMaterialList().forEach(product -> {
-                    materialProducts.add(convent2MCCafeOrderProductDemo(product, ProductType.LITTLE_MATERIAL_PRODUCT.getCode()));
-                });
-                createOrderProductDemoDto.setMaterialProduct(materialProducts);
             }
         }
+        if(CollectionUtils.isNotEmpty(cartGoodsDetailDto.getMaterialList())) {
+            //加料商品
+            createOrderProductDemoDto.setProductType(ProductType.MATERIALPRODUCT_UPPRICE.getCode());
+            List<CreateOrderProductRequest> materialProducts = new ArrayList<>();
+            cartGoodsDetailDto.getMaterialList().forEach(product -> {
+                materialProducts.add(convent2MCCafeOrderProductDemo(product, ProductType.LITTLE_MATERIAL_PRODUCT.getCode()));
+            });
+            createOrderProductDemoDto.setMaterialProduct(materialProducts);
+        }
         return createOrderProductDemoDto;
     }