|
|
@@ -214,8 +214,8 @@ public class CmsOrderController {
|
|
|
SearchResult<OrderMasterDonBackView> search1 = beanSearcher.search(OrderMasterDonBackView.class, builder.build());
|
|
|
search1.getDataList().forEach(mData -> {
|
|
|
List<OrderDonSkuBackView> orderDonBackViews = beanSearcher.searchAll(OrderDonSkuBackView.class, MapUtils.builder().field(OrderDonSkuBackView::getMOid, mData.getMOid()).build());
|
|
|
- mData.setOrderDonViews(orderDonBackViews);
|
|
|
- mData.getOrderDonViews().forEach(data -> {
|
|
|
+ mData.setChildren(orderDonBackViews);
|
|
|
+ mData.getChildren().forEach(data -> {
|
|
|
if (data.getPopularizeId() != null) {
|
|
|
Optional.ofNullable(channelPopularizeMapper.selectChannelByPid(data.getPopularizeId()))
|
|
|
.ifPresent(channelName -> data.setChannel(channelName));
|