update

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -400,6 +400,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                 .filter(scheduleManage -> scheduleManage.getOrderId() != null)
                 .collect(Collectors.groupingBy(ScheduleManage::getOrderId));
 
+        List<OrderRecord> orderRecordList = orderRecordService.list(new LambdaQueryWrapper<OrderRecord>().in(OrderRecord::getOrderServeId, orderServeList.stream().map(OrderServe::getId).collect(Collectors.toList())));
+        Map<Integer, List<OrderRecord>> orderRecordMap = orderRecordList.stream().collect(Collectors.groupingBy(OrderRecord::getOrderServeId));
+
         orderManagePage.getRecords().forEach(orderManage -> {
             orderManage.setListOrderServer(orderServeMap.get(orderManage.getId()));
             List<ScheduleManage> list = scheduledManageMap.get(orderManage.getId());
@@ -411,8 +414,12 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                     orderServe.setActualServeDuration((int) (orderServe.getEndTime().getTime() -
                             orderServe.getStartTime().getTime()) / 1000 / 60);
                 }
+                if (ListUtil.isNotEmpty(orderRecordMap.get(orderServe.getId()))) {
+                    orderServe.setOrderRecord(orderRecordMap.get(orderServe.getId()).stream().findAny().orElse(null));
+                }
             });
         });
+
         return orderManagePage;
     }
 

src/main/java/com/gogirl/domain/order/serve/OrderServe.java

@@ -214,9 +214,7 @@ public class OrderServe implements Serializable {
     private BigDecimal discountRate;
 
     private BigDecimal leisurePrice;
-//
-//    @ApiModelProperty("各种活动价格最终确定的活动价格")
-//    private BigDecimal activityPrice;
+
 
     public void addDiscountPrice(BigDecimal discountPrice) {
         this.discountPrice = this.discountPrice.add(discountPrice);

src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java

@@ -76,7 +76,7 @@ public class OrderManageController {
         qry.setPageSize(pageSize);
 
         Page<OrderManageDTO> orderManageDTOPage = (Page<OrderManageDTO>) orderManageService.queryListOrder(qry).convert(orderManageDTOAssembler);
-        orderManageDTOPage.setRecords(orderManageDTOPage.getRecords().stream().filter(orderManageDTO -> ListUtil.isNotEmpty(orderManageDTO.getImages())).collect(Collectors.toList()));
+        orderManageDTOPage.setRecords(orderManageDTOPage.getRecords().stream().peek(OrderManageDTO::setImages).filter(orderManageDTO -> ListUtil.isNotEmpty(orderManageDTO.getImages())).collect(Collectors.toList()));
         return JsonResult.success(orderManageDTOPage);
     }