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

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

@@ -1863,13 +1863,21 @@ public class OrderAdapter {
         for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean : productBeans) {
             OrderPrintDto.ProductsBean productVO = getProductBean(productBean);
             List<OrderPrintDto.ProductsBean> comboProductVOs = new ArrayList<>();
+            List<OrderPrintDto.ProductsBean> materialProductVOs = new ArrayList<>();
             if (CollectionUtils.isNotEmpty(productBean.getComboProduct())) {
                 for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean comboProduct : productBean.getComboProduct()) {
                     OrderPrintDto.ProductsBean sonProductVO = getProductBean(comboProduct);
                     comboProductVOs.add(sonProductVO);
                 }
             }
+            if (CollectionUtils.isNotEmpty(productBean.getMaterialProduct())) {
+                for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean materialProduct : productBean.getMaterialProduct()) {
+                    OrderPrintDto.ProductsBean materialProductVO = getProductBean(materialProduct);
+                    materialProductVOs.add(materialProductVO);
+                }
+            }
             productVO.setSonProducts(comboProductVOs);
+            productVO.setMaterialProducts(materialProductVOs);
             products.add(productVO);
         }
         return products;

order-application-service/src/main/java/cn/freemud/entities/dto/OrderPrintDto.java

@@ -128,6 +128,8 @@ public class OrderPrintDto {
         private Integer parentType;
         //套餐商品的子商品
         private List<ProductsBean> sonProducts;
+        //加料商品的加料
+        private List<ProductsBean> materialProducts;
     }
 
 }

order-application-service/src/main/java/cn/freemud/entities/dto/QueryOrdersResponseDto.java

@@ -365,6 +365,8 @@ public class QueryOrdersResponseDto {
 
                 List<ProductBean> comboProduct;
 
+                List<ProductBean> materialProduct;
+
                 @NoArgsConstructor
                 @Data
                 public static class ProductDiscount {