Commit a8fbcfc9 by chongfu.liang

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

parents 1dd62814 848c516f
...@@ -753,10 +753,10 @@ public class OrderSdkAdapter { ...@@ -753,10 +753,10 @@ public class OrderSdkAdapter {
} }
if (ObjectUtils.equals(ProductTypeEnum.MATERIAL_PRODUCT.getCode(), orderItem.getProductType())) { if (ObjectUtils.equals(ProductTypeEnum.MATERIAL_PRODUCT.getCode(), orderItem.getProductType())) {
// 获取加料子商品列表 // 获取加料子商品列表
productBean.setMeterailProduct(new ArrayList<>()); productBean.setMaterialProduct(new ArrayList<>());
String partnerProductId = orderItem.getProductId(); String partnerProductId = orderItem.getProductId();
List<OrderItemResp> materialProducts = orderItemList.stream().filter(item -> ObjectUtils.equals(partnerProductId, item.getParentProductId())).collect(Collectors.toList()); List<OrderItemResp> materialProducts = orderItemList.stream().filter(item -> ObjectUtils.equals(partnerProductId, item.getParentProductId())).collect(Collectors.toList());
materialProducts.forEach(material -> productBean.getMeterailProduct().add(getOldOrderProduct(orderSettlementResps, material))); materialProducts.forEach(material -> productBean.getMaterialProduct().add(getOldOrderProduct(orderSettlementResps, material)));
} }
productList.add(productBean); productList.add(productBean);
} }
......
...@@ -552,7 +552,7 @@ public class QueryOrdersResponse { ...@@ -552,7 +552,7 @@ public class QueryOrdersResponse {
/** /**
* 套餐子商品 * 套餐子商品
*/ */
public List<ProductBean> meterailProduct; public List<ProductBean> materialProduct;
@NoArgsConstructor @NoArgsConstructor
@Data @Data
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment