zoujiajian 2 роки тому
батько
коміт
f2d74b7e05

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderMasterDonBackView.java

@@ -137,5 +137,5 @@ public class OrderMasterDonBackView {
 	private String address;
 
 	@DbIgnore
-	private List<OrderDonSkuBackView> orderDonViews;
+	private List<OrderDonSkuBackView> children;
 }

+ 2 - 2
netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -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));