团队入住，添加团队标志

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusRoomBookingOrdersController.java

@@ -93,7 +93,9 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 	//@RequiresPermissions("business:bus_room_booking_orders:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody BookingOrderSaveDto busRoomBookingOrders) {
-		return Result.OK("预定成功",busRoomBookingOrdersService.bookingOrderSave(busRoomBookingOrders));
+		Boolean isTeam = busRoomBookingOrders.getOrderInfo().getBookingOrdersType().equals(2);
+		busRoomBookingOrders.getOrderInfo().setBookingOrdersType(2);
+		return Result.OK("预定成功",busRoomBookingOrdersService.bookingOrderSave(busRoomBookingOrders,isTeam));
 	}
 	 /**
 	  *   添加批次订单
@@ -267,7 +269,9 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 	 @ApiOperation(value="酒店预定订单-入住", notes="酒店预定订单-入住")
 	 @RequestMapping(value = "living",method = RequestMethod.POST)
 	 public  Result<String> living(@RequestBody BookingOrderSaveDto param) {
-		 return  Result.OK("入住成功",service.customerLiving(param));
+		 Boolean isTeam = param.getOrderInfo().getBookingOrdersType().equals(2);
+		 param.getOrderInfo().setBookingOrdersType(1);
+		 return  Result.OK("入住成功",service.customerLiving(param,isTeam));
 	 }
 
 

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

@@ -36,11 +36,15 @@ public class BusTeam implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "key")
     private Integer id;
-	/**客人id*/
-	@Excel(name = "客人id", width = 15)
-    @ApiModelProperty(value = "客人id")
-    private String customerId;
-	/**是否删除*/
+	/**预约id*/
+	@Excel(name = "预约id", width = 15)
+    @ApiModelProperty(value = "预约id")
+    private String bookingOrderId;
+    /**入住客单id*/
+    @Excel(name = "入住客单id", width = 15)
+    @ApiModelProperty(value = "入住客单id")
+    private String livingOrderId;
+    /**是否删除*/
 	@Excel(name = "是否删除", width = 15)
     @ApiModelProperty(value = "是否删除")
     private Integer isDelete;

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

@@ -20,7 +20,7 @@ import java.util.Map;
  */
 public interface IBusRoomBookingOrdersService extends IService<BusRoomBookingOrders> {
 
-    String bookingOrderSave(BookingOrderSaveDto item);
+    String bookingOrderSave(BookingOrderSaveDto item, Boolean isTeam);
 
     BookingOrderEditVo getBookingInfoById(String orderId, String bookingNo);
 
@@ -37,5 +37,5 @@ public interface IBusRoomBookingOrdersService extends IService<BusRoomBookingOrd
     Boolean setBatchOrderStatus(BusBookingBatch batchOrder);
     String bookingToLive(String bookingRoomId, List<BusLivingCustomer> customers);
 
-    String customerLiving(BookingOrderSaveDto livingData);
+    String customerLiving(BookingOrderSaveDto livingData, Boolean isTeam);
 }

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

@@ -62,9 +62,13 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
     @Resource
     private IBusLivingLayoutDayPriceService livingLayoutDayPriceService;
 
+    @Resource
+    private IBusTeamService teamService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String bookingOrderSave(BookingOrderSaveDto item) {
+    public String bookingOrderSave(BookingOrderSaveDto item, Boolean isTeam) {
+        isTeam = isTeam != null && isTeam;
         LoginUser user = TokenUtils.getAuthUser();
         item.getOrderInfo().setCreateTime(new Date());
         item.getOrderInfo().setCreateUser(user.getId());
@@ -195,6 +199,15 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
 
             // 处理预定每天的房型价格 End
 
+            //<editor-fold msg="团队标志">
+            if(isTeam) {
+                BusTeam team = new BusTeam();
+                team.setBookingOrderId(bookingId);
+                team.setIsDelete(0);
+                teamService.save(team);
+            }
+            //</editor-fold>
+
             return item.getOrderInfo().getBookingOrdersNo();
             // 团队预定
         } else if(item.getOrderInfo().getBookingOrdersType().equals(BookingOrdersType.TEAM.getKey())) {
@@ -323,6 +336,10 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             });
             result.setLivingRoomIds(livingRooms);
             //</editor-fold>
+            BusTeam team = teamService.getOne(Wrappers.<BusTeam>query().eq("booking_order_id",orderId));
+            if(team != null) {
+                result.setTeamTag(team.getId());
+            }
         } else if(orderInfo.getBookingOrdersType().equals(BookingOrdersType.TEAM.getKey())) {
             List<BusBookingBatch> batches = bookingBatchService.list(Wrappers.<BusBookingBatch>query().eq("booking_orders_id",orderId));
             List<BookingBatchRoomsVo> batchesVo = new ArrayList<>();
@@ -841,8 +858,8 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String customerLiving(BookingOrderSaveDto livingData) {
-        String bookingOrderNo = bookingOrderSave(livingData);
+    public String customerLiving(BookingOrderSaveDto livingData, Boolean isTeam) {
+        String bookingOrderNo = bookingOrderSave(livingData,isTeam);
         if(bookingOrderNo != null && !bookingOrderNo.isEmpty()){
             BookingOrderEditVo bookingOrderVo =  getBookingInfoById(null,bookingOrderNo);
             // 散客取roomIds

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

@@ -24,6 +24,8 @@ public class BookingOrderEditVo {
     private List<BusBookingLayoutDayPrice> layoutDayPrices;
     @ApiModelProperty(value = "如果是团队预定,关联房间ID和房型每天价格 走这个参数")
     private List<BookingBatchRoomsVo> batchRooms;
+    @ApiModelProperty(value = "团队标志")
+    private Integer teamTag;
     // 联系人名称
     private String contactName;
     // 联系人电话