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

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -742,6 +742,10 @@ public class OrderSdkAdapter {
         List<OrderItemResp> parentOrderItemList = orderItemList == null ? new ArrayList<>() : orderItemList.stream()
                 .filter(item -> StringUtils.isEmpty(item.getParentProductId()) || ObjectUtils.equals("0", item.getParentProductId()))
                 .collect(Collectors.toList());
+        List<OrderItemResp> materailProductItemList = orderItemList == null ? new ArrayList<>() : orderItemList.stream()
+                .filter(item -> StringUtils.isNotBlank(item.getParentProductId()) && ObjectUtils.equals(ProductTypeEnum.MATERAIL_PRODUCT.getCode(), item.getProductType()))
+                .collect(Collectors.toList());
+
         for (OrderItemResp orderItem : parentOrderItemList) {
             QueryOrdersResponse.DataBean.OrderBean.ProductBean productBean = getOldOrderProduct(orderSettlementResps, orderItem);
             if (ObjectUtils.equals(ProductTypeEnum.SETMEAL_PRODUCT.getCode(), orderItem.getProductType()) || ObjectUtils.equals(ProductTypeEnum.SETMEAL_UPPRICE_PRODUCT.getCode(), orderItem.getProductType())) {
@@ -751,17 +755,17 @@ public class OrderSdkAdapter {
                 List<OrderItemResp> comboProducts = orderItemList.stream().filter(item -> ObjectUtils.equals(partnerProductId, item.getParentProductId())).collect(Collectors.toList());
                 comboProducts.forEach(combo -> productBean.getComboProduct().add(getOldOrderProduct(orderSettlementResps, combo)));
             }
-            if (ObjectUtils.equals(ProductTypeEnum.MATERAIL_PRODUCT.getCode(), orderItem.getProductType())) {
-                // 获取加料商品列表
-
-                List<QueryOrdersResponse.DataBean.OrderBean.ProductBean> meterailProduct = productBean.getMeterailProduct();
-                if (CollectionUtils.isEmpty(meterailProduct)){
-                    productBean.setMeterailProduct(new ArrayList<>());
-                }
-                productBean.getMeterailProduct().add(getOldOrderProduct(orderSettlementResps, orderItem));
-            }
             productList.add(productBean);
         }
+        for (OrderItemResp metarail : materailProductItemList){
+            // 获取加料商品列表
+            QueryOrdersResponse.DataBean.OrderBean.ProductBean productBean = productList.stream().filter(item -> item.getProductId().equals(metarail.getParentProductId())).findFirst().get();
+            List<QueryOrdersResponse.DataBean.OrderBean.ProductBean> meterailProduct = productBean.getMeterailProduct();
+            if (CollectionUtils.isEmpty(meterailProduct)){
+                productBean.setMeterailProduct(new ArrayList<>());
+            }
+            productBean.getMeterailProduct().add(getOldOrderProduct(orderSettlementResps, metarail));
+        }
         return productList;
     }