Merge remote-tracking branch 'origin/master'

jiangping

2024-09-23 ce4a7783e6def97a27b7535483f3cb96a8d07e48

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -142,7 +142,7 @@
        //发送会议预约成功通知
        this.sendNotice(bookings, MeetConstants.TWO);
        //发送微信订阅通知
        sendWxMessage.bookingsReservation(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
//        sendWxMessage.bookingsReservation(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));

        return bookings.getId();
    }
@@ -1036,7 +1036,7 @@
        if (!bookings.getCreator().equals(businessOverDTO.getUserId()) && userRelList <= 0) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "非你的预约记录,无法进行该操作");
        }
        if (System.currentTimeMillis() < bookings.getStartTime().getTime()) {
        if (System.currentTimeMillis() < bookings.getStartTimeReal().getTime()) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "会议未开始,无法进行结束，如需该操作请使用取消功能");
        }
        if (System.currentTimeMillis() > bookings.getEndTime().getTime()) {
@@ -1138,7 +1138,7 @@

            if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
                    .lambda() 
                    .apply(" END_TIME > now() and START_TIME < now() ")
                    .apply(" (  END_TIME > now() and START_TIME < now() ) or  ( END_TIME > now() and  START_TIME_REAL < now() )  ")
                    .isNotNull(Bookings::getStartTimeReal)
                    .isNull(Bookings::getDoneDate)
                    .eq(Bookings::getStatus,Constants.ZERO)
@@ -1253,7 +1253,7 @@
            bookingsMapper.updateById(bookings);
            this.sendNotice(bookings, MeetConstants.ONE);
            //发送微信通知
            sendWxMessage.bookingsStart(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
//            sendWxMessage.bookingsStart(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
        }
    }