覃浩 2 vuotta sitten
vanhempi
commit
ba597c1ca2

+ 2 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusRoomBookingOrdersServiceImpl.java

@@ -419,7 +419,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                     }
                     BusRoomsLivingOrder order = opLvOrder.get();
                     List<BusLivingCustomer> currentLivingCustomers = livingCustomers.stream().filter(s->s.getLivingOrderId().equals(order.getId())).collect(Collectors.toList());
+                    List<BusLivingLayoutDayPrice> lvDayPrices = livingLayoutDayPriceService.list(Wrappers.<BusLivingLayoutDayPrice>query().eq("living_order_id",order.getId()));
                     r.setLivingOrder(order);
+                    r.setLivingDayPrices(lvDayPrices);
                     r.setLivingCustomers(currentLivingCustomers);
                 }
             });

+ 1 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/ExtendBusBookingRoomsVo.java

@@ -11,6 +11,7 @@ public class ExtendBusBookingRoomsVo extends BusBookingRooms {
     private String layoutName;
     private String roomName;
     private List<BusBookingLayoutDayPrice> layoutDayPrices;
+    private List<BusLivingLayoutDayPrice> livingDayPrices;
     private BusRoomsLivingOrder livingOrder;
     private List<BusLivingCustomer> livingCustomers;
 }