fixbug 排房状态

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

@@ -102,8 +102,22 @@ public class BusBookingRoomsController extends JeecgController<BusBookingRooms,
 		busBookingRoomsService.updateById(busBookingRooms);
 		return Result.OK("编辑成功!");
 	}
-	
-	/**
+//	 /**
+//	  *  设置为主房
+//	  *
+//	  * @param busBookingRooms
+//	  * @return
+//	  */
+//	 @AutoLog(value = "预定关联房间-设置为主房")
+//	 @ApiOperation(value="预定关联房间-设置为主房", notes="预定关联房间-设置为主房")
+//	 //@RequiresPermissions("business:bus_booking_rooms:edit")
+//	 @RequestMapping(value = "/set", method = {RequestMethod.PUT,RequestMethod.POST})
+//	 public Result<String> edit(@RequestBody BusBookingRooms busBookingRooms) {
+//		 busBookingRoomsService.updateById(busBookingRooms);
+//		 return Result.OK("编辑成功!");
+//	 }
+
+	 /**
 	 *   通过id删除
 	 *
 	 * @param id

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

@@ -16,5 +16,5 @@ import java.util.List;
 public interface IBusBookingRoomsService extends IService<BusBookingRooms> {
 
     List<ExtendBusBookingRoomsVo> bookingRooms(String bookingId, Integer type);
-
+    Boolean setMain(String relationRoomId);
 }

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.business.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.business.entity.BusBookingRooms;
 import org.jeecg.modules.business.mapper.BusBookingRoomsMapper;
 import org.jeecg.modules.business.service.IBusBookingRoomsService;
@@ -23,4 +25,12 @@ public class BusBookingRoomsServiceImpl extends ServiceImpl<BusBookingRoomsMappe
     public List<ExtendBusBookingRoomsVo> bookingRooms(String bookingId,Integer type) {
         return baseMapper.bookingRooms(bookingId,type);
     }
+
+    @Override
+    public Boolean setMain(String relationRoomId) {
+        BusBookingRooms roomR =  getById(relationRoomId);
+        if(roomR==null) throw new JeecgBootException("未找到房间");
+//        update(Wrappers.<BusBookingRooms>query())
+        return null;
+    }
 }

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

@@ -142,9 +142,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                 BusBookingRooms bookingRoomsItem = new BusBookingRooms();
                 bookingRoomsItem.setBookingOrdersId(bookingId);
                 if(c.getRoomId() != null && !c.getRoomId().isEmpty()){
-                    bookingRoomsItem.setRoomStatus(1);
-                } else {
                     bookingRoomsItem.setRoomStatus(2);
+                } else {
+                    bookingRoomsItem.setRoomStatus(1);
                 }
                 if(mainCount != 1) {
                     bookingRoomsItem.setIsMain(false);
@@ -207,9 +207,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                     bookingRoomItem.setRoomId(s.getRoomId());
                     bookingRoomItem.setRoomLayoutId(s.getLayoutId());
                     if(s.getRoomId() != null && !s.getRoomId().isEmpty()){
-                        bookingRoomItem.setRoomStatus(1);
-                    } else {
                         bookingRoomItem.setRoomStatus(2);
+                    } else {
+                        bookingRoomItem.setRoomStatus(1);
                     }
                     if(mainCount != 1) {
                         bookingRoomItem.setIsMain(false);
@@ -389,9 +389,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                 BusBookingRooms bookingRoomsItem = new BusBookingRooms();
                 bookingRoomsItem.setBookingOrdersId(bookingId);
                 if(c.getRoomId() != null && !c.getRoomId().isEmpty()){
-                    bookingRoomsItem.setRoomStatus(1);
-                } else {
                     bookingRoomsItem.setRoomStatus(2);
+                } else {
+                    bookingRoomsItem.setRoomStatus(1);
                 }
                 if(mainCount != 1) {
                     bookingRoomsItem.setIsMain(false);
@@ -456,9 +456,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                     BusBookingRooms bookingRoomItem = new BusBookingRooms();
                     bookingRoomItem.setRoomId(s.getRoomId());
                     if(s.getRoomId() != null && !s.getRoomId().isEmpty()){
-                        bookingRoomItem.setRoomStatus(1); // 未排房
+                        bookingRoomItem.setRoomStatus(2); // 未排房
                     } else {
-                        bookingRoomItem.setRoomStatus(2); // 已排房
+                        bookingRoomItem.setRoomStatus(1); // 已排房
                     }
                     if(mainCount != 1) {
                         bookingRoomItem.setIsMain(false);