From ebd3867b9b896afd5768f04afaf53b905d01f64b Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 19 十二月 2024 14:57:34 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 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 16e2bcb..4f08d14 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
@@ -153,9 +153,9 @@
//鍙戦�佷細璁绾︽垚鍔熼�氱煡
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, MeetConstants.TWO);
+ SystemUser systemUser = systemUserMapper.selectById(user.getId());
+ this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
}
- SystemUser systemUser = systemUserMapper.selectById(user.getId());
- this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
return bookings.getId();
}
@@ -386,9 +386,9 @@
//鍙戦�佷細璁�氱煡
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, MeetConstants.TWO);
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
+ this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
}
- SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
- this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
}
@Override
@@ -458,9 +458,8 @@
//鍙栨秷浼氳 鍙戦�佸彇娑堥�氱煡
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, 3);
+ this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
}
- this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
-
}
@Override
@@ -1272,12 +1271,14 @@
public void dealMeetingStatus(List<MeetingListResponse> meetingResponseList){
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(meetingResponseList)){
String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
- String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.SOON_START).getCode();
+ String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.EARLY_START).getCode();
Integer minute = StringUtils.isNotBlank(configMinute) ? Integer.valueOf(configMinute) : 120;
for (MeetingListResponse m:meetingResponseList) {
if(Constants.equalsInteger(m.getStatus(),Constants.ZERO)&&Constants.equalsInteger(m.getMeetingStatus(),Constants.ONE)){
//寮�濮嬪墠120鍒嗛挓 澶т簬褰撳墠鏃堕棿 鍒欐樉绀哄嵆灏嗗紑濮�
- if(DateUtil.afterMinutesDate(m.getStartTime(),-minute).getTime()>System.currentTimeMillis()){
+ if(
+ DateUtil.afterMinutesDate(m.getStartTime(),-minute).getTime()<=System.currentTimeMillis()
+ ){
m.setMeetingStatus(4);
}
}
@@ -1414,7 +1415,7 @@
if(Constants.equalsInteger(sendType,Constants.ZERO)){
wxPlatNotice.sendMeetingBookTemplateNotice(systemDictDataBiz,bookings,"CuoDoxOl6SFwi4NhNgOQgKSJVjDD4VCIaPYlnbv_zdY",
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),openIds);
- }else{
+ }else if(Constants.equalsInteger(sendType,Constants.ONE)){
wxPlatNotice.sendMeetingBookCancelTemplateNotice(systemDictDataBiz,bookings,"CiB6vCT2InovAoQfudY-lvzLSV0-3lfz3a5GsSFCzd8",
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),openIds);
}
@@ -1537,6 +1538,7 @@
)
.eq("c.DELETED",0)
.eq("c.status",0)
+ .eq("m.WORK_STATUS",0)
.orderByAsc("c.id")
);
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
--
Gitblit v1.9.3