From a1647a5152e3d368ec2fb738ca7cc858e220d06c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 24 九月 2024 09:15:08 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index a973cf6..2c39a98 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/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();
}
@@ -1010,7 +1010,7 @@
//鍙栨秷浼氳 鍙戦�佸彇娑堥�氱煡
this.sendNotice(bookings, 3);
//鍙戦�佸井淇¤闃呴�氱煡
- sendWxMessage.bookingsCancel(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
+// sendWxMessage.bookingsCancel(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
}
@@ -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()) {
@@ -1124,7 +1124,6 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼氳浠呭彲浠ユ彁鍓�"+beforeMinutes+"鍒嗛挓寮�濮�");
}
//鏌ヨ鏄惁瀛樺湪鍏朵粬鏈紑濮嬬殑浼氳 闃叉棰楃矑搴︿笌鎻愬墠寮�濮嬬殑闂
-
if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
.lambda()
.apply(" now() < START_TIME and END_TIME <= '" + DateUtil.DateToStr(bookings.getStartTime(),"yyyy-MM-dd HH:mm:ss") +"'" )
@@ -1134,22 +1133,22 @@
.eq(Bookings::getRoomId,bookings.getRoomId())
.ne(Bookings::getId,bookings.getId())
)>Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏈紑鍚細璁紝鏃犳硶杩涜寮�濮嬩細璁�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏈紑鍚細璁紝鏃犳硶寮�濮嬩細璁�");
};
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)
.eq(Bookings::getRoomId,bookings.getRoomId())
)>Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠寮�鍚椂闂翠笌鍏朵粬浼氳瀛樺湪鍐茬獊锛屾棤娉曡繘琛屽紑濮嬩細璁�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠寮�鍚椂闂翠笌鍏朵粬浼氳瀛樺湪鍐茬獊锛屾棤娉曞紑濮嬩細璁�");
};
}else{
if(bookings.getStartTime().getTime() > System.currentTimeMillis()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈埌浼氳鐢宠寮�濮嬫椂闂达紝鏃犳硶杩涜寮�濮�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈埌浼氳鐢宠寮�濮嬫椂闂达紝鏃犳硶寮�濮�");
}
}
bookings.setStartTimeReal(new Date());
@@ -1254,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()));
}
}
--
Gitblit v1.9.3