Merge remote-tracking branch 'origin/main'

share-system/src/main/java/share/system/service/impl/RoomStatusServiceImpl.java

@@ -132,7 +132,8 @@ public class RoomStatusServiceImpl implements RoomStatusService {
                 if(Objects.isNull(user)||Objects.isNull(user.getId())||order.getConsumerId().compareTo(user.getId())!=0){
                     orderEndDate = DateUtils.addMinutes(orderEndDate,Constants.ROOM_LOCK_DELAY_MINUTE);
                 }
-                if (timeHourDate.compareTo(orderStartDate) > 0 && timeHourDate.compareTo(orderEndDate) < 0) {
+
+                if (DateUtils.addSeconds(timeHourDate, 59 * 60 + 59).compareTo(orderStartDate) >= 0 && timeHourDate.compareTo(orderEndDate) < 0) {
                     vo.setStatus(RoomStatusEnum.HOLD.getValue());
                     //判断订单开始时间是否是同一个小时，如果是同一个小时，占用结束时间为订单开始时间
                     if(StringUtils.equals(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH,timeHourDate)