提交代码

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusOrderFee.java

@@ -139,6 +139,7 @@ public class BusOrderFee implements Serializable {
 
     private String returnFeeId;
     private Boolean returnItem;
+
     @ApiModelProperty(value = "每天价格")
     @TableField(exist = false)
     private List<BusLivingLayoutDayPrice> prices;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusRoomBookingOrders.java

@@ -201,7 +201,10 @@ public class BusRoomBookingOrders implements Serializable {
 
     @TableField(exist = false)
     private Boolean isTeam;
-
+    @TableField(exist = false)
+    private Boolean isRel;
+    @TableField(exist = false)
+    private String relTag;
     @TableField(exist = false)
     private Integer settleType;
     @TableField(exist = false)

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusRoomsLivingOrder.java

@@ -234,4 +234,10 @@ public class BusRoomsLivingOrder implements Serializable {
     @TableField(exist = false)
     private String teamTag;
 
+    @TableField(exist = false)
+    private Boolean isRel;
+
+    @TableField(exist = false)
+    private String relTag;
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusTeam.java

@@ -35,7 +35,7 @@ public class BusTeam implements Serializable {
 	/**key*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "key")
-    private Integer id;
+    private String id;
 	/**预约id*/
 	@Excel(name = "预约id", width = 15)
     @ApiModelProperty(value = "预约id")
@@ -64,4 +64,7 @@ public class BusTeam implements Serializable {
 
 	private String hotelId;
 	private Integer sortIndex;
+
+	// 1团队2联房
+	private Integer relType;
 }

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

@@ -292,8 +292,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             //<editor-fold msg="团队标志">
             if(isTeam) {
                 BusTeam team = new BusTeam();
-                List<BusTeam> existTeams = teamService.list(Wrappers.<BusTeam>query().eq("is_delete", 0).eq("hotel_id", hotelId));
-                Integer sortIndex = 0;
+                List<BusTeam> existTeams = teamService.list(Wrappers.<BusTeam>query().eq("is_delete", 0).eq("hotel_id", hotelId)
+                        .eq("rel_type",1)); // 1团队房，2联房
+                Integer sortIndex = 1;
                 List<Integer> indexs = existTeams.stream().map(s->s.getSortIndex()).collect(Collectors.toList());
                 while(true){
                     Integer finalSortIndex = sortIndex;
@@ -306,8 +307,31 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                 team.setIsDelete(0);
                 team.setHotelId(hotelId);
                 team.setSortIndex(sortIndex);
+                team.setRelType(1);
 
                 teamService.save(team);
+            } else {
+                if(isLiving && item.getRoomIds().size() > 1) {
+                    BusTeam team = new BusTeam();
+                    List<BusTeam> existTeams = teamService.list(Wrappers.<BusTeam>query().eq("is_delete", 0).eq("hotel_id", hotelId)
+                            .eq("rel_type",2)); // 1团队房，2联房
+                    Integer sortIndex = 1;
+                    List<Integer> indexs = existTeams.stream().map(s->s.getSortIndex()).collect(Collectors.toList());
+                    while(true){
+                        Integer finalSortIndex = sortIndex;
+                        if(indexs.stream().filter(s->s.equals(finalSortIndex)).count() == 0) {
+                            break;
+                        }
+                        sortIndex++;
+                    }
+                    team.setBookingOrderId(bookingId);
+                    team.setIsDelete(0);
+                    team.setHotelId(hotelId);
+                    team.setSortIndex(sortIndex);
+                    team.setRelType(2);
+
+                    teamService.save(team);
+                }
             }
             //</editor-fold>
 
@@ -448,7 +472,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             //</editor-fold>
             BusTeam team = teamService.getOne(Wrappers.<BusTeam>query().eq("booking_order_id",orderId));
             if(team != null) {
-                result.setTeamTag(team.getId());
+                result.setTeamTag(team.getSortIndex());
             }
         } else if(orderInfo.getBookingOrdersType().equals(BookingOrdersType.TEAM.getKey())) {
             List<BusBookingBatch> batches = bookingBatchService.list(Wrappers.<BusBookingBatch>query().eq("booking_orders_id",orderId));
@@ -1428,6 +1452,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         BusBookingRooms bookingRoom = bookingRoomsService.getById(livingOrder.getBookingRoomId());
         if(bookingRoom == null) throw new JeecgBootException("订单房间不存在");
         BusRoomBookingOrders newBookingOrder = copyBookingToAcceptOrder(livingOrder);
+        newBookingOrder.setHotelId(livingOrder.getHotelId());
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
         newBookingOrder.setBookingOrdersNo("YD"+sdf.format(System.currentTimeMillis()));
         save(newBookingOrder);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesRoomsController.java

@@ -145,7 +145,9 @@ public class CesRoomsController {
             });
             List<FwRoomLock> unLockeds = fwRoomLockService.list(Wrappers.<FwRoomLock>query().eq("hotel_id",hotelId));
             List<FwRoomRepair> unRepairs = fwRoomRepairService.list(Wrappers.<FwRoomRepair>query().eq("hotel_id",hotelId).eq("status",1));
-            List<BusTeam> teamOrders =bookingOrderIds.size() >0? teamService.list(Wrappers.<BusTeam>query().in("booking_order_id",bookingOrderIds)):new ArrayList<>();
+            List<BusTeam> teamOrders_all =bookingOrderIds.size() >0? teamService.list(Wrappers.<BusTeam>query().in("booking_order_id",bookingOrderIds)):new ArrayList<>();
+//            List<BusTeam> teamOrders = teamOrders_all.stream().filter(sb->sb.getRelType().equals(1)).collect(Collectors.toList());
+//            List<BusTeam> relOrders = teamOrders_all.stream().filter(sb->sb.getRelType().equals(2)).collect(Collectors.toList());
             floors.forEach(s-> {
                 List<CesRooms> floorRooms = allRooms.stream().filter(a->a.getFloorId().equals(s.getId())).collect(Collectors.toList());
                 List<FloorBuildingRoomVo> roomInfos = new ArrayList<>();
@@ -184,18 +186,32 @@ public class CesRoomsController {
                         roomVo.setLivingData(opFindRoomVo.get().getLivingData());
                         if(opFindRoomVo.get().getBookingData().getBookingOrder() != null) {
                             BusRoomBookingOrders bookingOrders = opFindRoomVo.get().getBookingData().getBookingOrder();
-                            Optional<BusTeam> opTeam = teamOrders.stream().filter(r->r.getBookingOrderId().equals(bookingOrders.getId())).findFirst();
+                            Optional<BusTeam> opTeam = teamOrders_all.stream().filter(r->r.getBookingOrderId().equals(bookingOrders.getId())).findFirst();
                             if(opTeam.isPresent()) {
-                                opFindRoomVo.get().getBookingData().getBookingOrder().setIsTeam(true);
-                                opFindRoomVo.get().getBookingData().getBookingOrder().setTeamTag("团"+opTeam.get().getSortIndex());
+                                BusTeam t = opTeam.get();
+                                if(t.getRelType().equals(1)) {
+                                    opFindRoomVo.get().getBookingData().getBookingOrder().setIsTeam(true);
+                                    opFindRoomVo.get().getBookingData().getBookingOrder().setTeamTag("团"+t.getSortIndex());
+                                } else {
+//                                    opFindRoomVo.get().getBookingData().getBookingOrder().setIsRel(true);
+//                                    opFindRoomVo.get().getBookingData().getBookingOrder().setRelTag("联"+t.getSortIndex());
+                                }
+
                             }
                         }
                         if(opFindRoomVo.get().getLivingData().getLivingOrder() != null) {
                             BusRoomsLivingOrder livingOrder = opFindRoomVo.get().getLivingData().getLivingOrder();
-                            Optional<BusTeam> opTeam = teamOrders.stream().filter(r->r.getBookingOrderId().equals(livingOrder.getBookingOrderId())).findFirst();
+                            Optional<BusTeam> opTeam = teamOrders_all.stream().filter(r->r.getBookingOrderId().equals(livingOrder.getBookingOrderId())).findFirst();
                             if(opTeam.isPresent()) {
-                                opFindRoomVo.get().getLivingData().getLivingOrder().setIsTeam(true);
-                                opFindRoomVo.get().getLivingData().getLivingOrder().setTeamTag("团"+opTeam.get().getSortIndex());
+                                BusTeam t = opTeam.get();
+                                if(t.getRelType().equals(1)) {
+                                    opFindRoomVo.get().getLivingData().getLivingOrder().setIsTeam(true);
+                                    opFindRoomVo.get().getLivingData().getLivingOrder().setTeamTag("团"+opTeam.get().getSortIndex());
+                                } else {
+                                    opFindRoomVo.get().getLivingData().getLivingOrder().setIsRel(true);
+                                    opFindRoomVo.get().getLivingData().getLivingOrder().setRelTag("联"+opTeam.get().getSortIndex());
+                                }
+
                             }
                         }
                         roomVo.setBookingData(opFindRoomVo.get().getBookingData());