修改批次状态，fix保存批次更新bug

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

@@ -15,6 +15,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.business.dto.BatchOrderSavaDto;
 import org.jeecg.modules.business.dto.BookingOrderSaveDto;
+import org.jeecg.modules.business.entity.BusBookingBatch;
 import org.jeecg.modules.business.entity.BusRoomBookingOrders;
 import org.jeecg.modules.business.service.IBusRoomBookingOrdersService;
 
@@ -234,4 +235,17 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
     	return  Result.ok(service.batchOrderDetail(batchId));
 	 }
 
+
+	 /**
+	  * 设置预约订单批次单状态
+	  * @param
+	  * @return
+	  */
+	 @ApiOperation(value="酒店预定订单-设置预约订单批次单状态", notes="酒店预定订单-设置预约订单批次单状态")
+	 @RequestMapping(value = "set-batch-order-status",method = RequestMethod.POST)
+	 public  Result<Boolean> setBatchOrderStatus(BusBookingBatch batch) {
+		 return  Result.ok(service.setBatchOrderStatus(batch));
+	 }
+
+
 }

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

@@ -127,6 +127,10 @@ public class BusBookingBatch implements Serializable {
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String remark;
+    /**预定记录状态；1 正常  2 取消*/
+    @Excel(name = "预定记录状态；1 正常  2 取消", width = 15)
+    @ApiModelProperty(value = "预定记录状态；1 正常  2 取消")
+    private Integer bookingStatus;
 
     private String customerSource;
     private Integer bookingType;

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

@@ -127,7 +127,7 @@ public class BusRoomBookingOrders implements Serializable {
 	@Excel(name = "创建人", width = 15)
     @ApiModelProperty(value = "创建人")
     private String createUser;
-	/**预定记录状态；待定*/
+	/**预定记录状态；1 正常  2 取消*/
 	@Excel(name = "预定记录状态；待定", width = 15)
     @ApiModelProperty(value = "预定记录状态；待定")
     private Integer bookingStatus;

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.business.service;
 
 import org.jeecg.modules.business.dto.BatchOrderSavaDto;
 import org.jeecg.modules.business.dto.BookingOrderSaveDto;
+import org.jeecg.modules.business.entity.BusBookingBatch;
 import org.jeecg.modules.business.entity.BusRoomBookingOrders;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.business.vo.BatchOrderEditVo;
@@ -28,4 +29,6 @@ public interface IBusRoomBookingOrdersService extends IService<BusRoomBookingOrd
     BatchOrderEditVo batchOrderDetail(String batchId);
 
     String batchOrderSave(BatchOrderSavaDto item);
+
+    Boolean setBatchOrderStatus(BusBookingBatch batchOrder);
 }

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

@@ -665,7 +665,10 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
 
 //        BusBookingBatch batchItem = copyBatchToBase(c);
 //        BusBookingBatch batchItem = copyBatchToBase(c);
-        bookingBatchService.save(c);
+        if(item.getOrderInfo().getId() != null && !item.getOrderInfo().getId().isEmpty()) {
+            bookingBatchService.updateById(c);
+        }
+        else bookingBatchService.save(c);
         List<BusBookingRooms> batchBookingRooms = new ArrayList<>();
         long mainCount = item.getRoomIds().stream().filter(t->t.getIsMain()!=null&&t.getIsMain()).count();
         item.getRoomIds().forEach(s-> {
@@ -713,6 +716,24 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         return c.getBatchNo();
     }
 
+    /**
+     * 设置批次预定状态
+     * @param batchOrder
+     * @return
+     */
+    @Override
+    public Boolean setBatchOrderStatus(BusBookingBatch batchOrder) {
+        if(batchOrder == null || batchOrder.getId() == null || batchOrder.getId().isEmpty()
+        || BookingStatusTypeEnum.val(batchOrder.getBookingStatus()) == null
+        )
+            throw new JeecgBootException("参数错误");
+        BusBookingBatch queryBatchOrder = bookingBatchService.getById(batchOrder.getId());
+        if(queryBatchOrder == null) throw new JeecgBootException("订单批次不存在");
+        queryBatchOrder.setBookingStatus(batchOrder.getBookingStatus());
+        bookingBatchService.updateById(queryBatchOrder);
+        return true;
+    }
+
 
     private BusBookingBatch copyBatchToBase(BookingBatchRoomsDto data) {
         BusBookingBatch batch = new BookingBatchRoomsDto();

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/mapper/xml/CesRoomsMapper.xml

@@ -75,6 +75,7 @@
                 WHERE
                     br.booking_type = 2
                   AND o.booking_status = 1
+                  and bi.booking_status = 1
                   and TIMESTAMPDIFF(minute, ADDDATE(now(),INTERVAL 8 HOUR),bi.arrival_time) > -2 -- 计算批次号中如果有超时的批次，则批次关联房间均失效
                 )
                 as t on