fix

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusRoomBookingOrdersMapper.xml

@@ -146,7 +146,9 @@ lo.booking_order_id
                 sum(if(fee.fee_type = 1,fee.money,0))
             ) as yu_e,
             1 as is_living ,
-            ifNULL(lo.settle_type,-1) as settle_type
+            ifNULL(lo.settle_type,-1) as settle_type,
+            lo.customer_source as customer_source_id,
+            lo.living_order_no as order_no
             from
             ces_room_building_floor b inner join
             ces_room_building_floor b1 on b.parent_id = b1.id
@@ -178,7 +180,9 @@ lo.booking_order_id
             0 as yajin,
             0 as yu_e,
             0 as is_living ,
-            -2 as settle_type
+            -2 as settle_type,
+            lo.customer_source as customer_source_id,
+            lo.booking_orders_no as order_no
             from
             ces_room_building_floor b inner join
             ces_room_building_floor b1 on b.parent_id = b1.id
@@ -209,7 +213,7 @@ lo.booking_order_id
     <select id="getKeLiLiving" resultType="org.jeecg.modules.business.vo.KeLiItemVo">
         select
         o.id,
-        o.living_order_no as oder_no,
+        o.living_order_no as order_no,
         cus.`name` as customer_name,
         cus.phone as customer_phone,
         o.customer_type,

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

@@ -1371,7 +1371,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         IPage<KeLiItemVo> pRes = baseMapper.getKeLiLiving(page,thirdUserId,hotelId,keyw,status);
         List<String> livingIds = pRes.getRecords().stream().map(s->s.getId()).collect(Collectors.toList());
         List<BusLivingLayoutDayPrice> prices = livingIds.size() >0? livingLayoutDayPriceService.list(Wrappers.<BusLivingLayoutDayPrice>query()
-        .in("living_order_id",livingIds)) : new ArrayList<>();
+        .in("living_order_id",livingIds).orderByAsc("day_time")) : new ArrayList<>();
         pRes.getRecords().forEach(s->{
             List<BusLivingLayoutDayPrice> orderDayPrice = prices.stream().filter(a->a.getLivingOrderId().equals(s.getId())).collect(Collectors.toList());
             s.setLivingDayPrices(orderDayPrice);
@@ -1383,7 +1383,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         IPage<KeLiItemVo> pRes = baseMapper.getKeBooking(page,thirdUserId,hotelId,keyw,status);
         List<String> livingIds = pRes.getRecords().stream().map(s->s.getId()).collect(Collectors.toList());
         List<BusBookingLayoutDayPrice> prices = livingIds.size() >0? dayPriceService.list(Wrappers.<BusBookingLayoutDayPrice>query()
-                .in("booking_order_id",livingIds)) : new ArrayList<>();
+                .in("booking_order_id",livingIds).orderByAsc("day_time")) : new ArrayList<>();
         pRes.getRecords().forEach(s->{
             List<BusBookingLayoutDayPrice> orderDayPrice = prices.stream().filter(a->a.getBookingOrderId().equals(s.getId()) && a.getRoomLayoutId().equals(s.getLayoutId())).collect(Collectors.toList());
             s.setBookingDayPrices(orderDayPrice);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/RiLiFangTaiVo.java

@@ -28,5 +28,9 @@ public class RiLiFangTaiVo {
     private Integer settleType;
     private String customerName;
     private String customerPhone;
+    private String customerSourceId;
+    private String layoutName;
+    private String orderNo;
+
 
 }