Merge branch 'feature/1.9.32-加料商品开发' into develop

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

@@ -1651,6 +1651,11 @@ public class OrderAdapter {
                     productBean.getComboProduct().forEach(product -> setMealProducts.add(convent2ProductVo(product)));
                     productVo.setSetMealProducts(setMealProducts);
                 }
+                if (ObjectUtils.equals(ProductTypeEnum.MATERIAL_PRODUCT.getCode(), productBean.getProductType())) {
+                    List<ProductVo> setMaterialProducts = new ArrayList<>();
+                    productBean.getMaterialProduct().forEach(product -> setMaterialProducts.add(convent2ProductVo(product)));
+                    productVo.setSetMaterialProducts(setMaterialProducts);
+                }
                 productVos.add(productVo);
             }
             productVos.sort(Comparator.comparing(ProductVo::getSequence));

order-application-service/src/main/java/cn/freemud/entities/vo/ProductVo.java

@@ -152,4 +152,6 @@ public class ProductVo {
 
     private List<InventedParentActivityVo> InventedParentActivitiesVo;
 
+    private List<ProductVo> setMaterialProducts;
+
 }