LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 41424 在来款中新建的会议,在会员的门户端中,会议通知和会议文件没有回显

Browse Source
This commit is contained in:
lijiarao
2021-10-26 15:50:10 +08:00
parent 2813675a39
commit a5f18889ee
2 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+42 -8
View File
@@ -134,6 +134,18 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
//新增会员系统标协会议
if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
stableCrossTrainingService.add(payMeeting, hotelContactsList);
List<String> fileIdList = new ArrayList<>();
String meetingFiles = payMeeting.getMeetingFiles();
if (StrUtil.isNotBlank(meetingFiles)){
List<String> strings = Arrays.asList(meetingFiles.split(","));
List<String> arrayList = new ArrayList<>(strings);
fileIdList.addAll(arrayList);
}
String paymentQrCode = payMeeting.getPaymentQrCode();
if (StrUtil.isNotBlank(paymentQrCode)){
fileIdList.add(paymentQrCode);
}
pushStandardsFiles(fileIdList);
}
//工作组会议发送通知
if (Objects.equals(payMeeting.getMeetingType(), Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))) {
@@ -155,6 +167,23 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
}
}
/**
* 推送文件到会员系统
* @param ids 文件id
*/
private void pushStandardsFiles(List<String> ids) {
if (!ids.isEmpty()){
List<OSSFile> ossFiles = iossFileService.listByIds(ids);
for (OSSFile ossFile : ossFiles) {
String url = ossFile.getUrl();
String[] fileUrl = url.split("/");
int length = fileUrl.length;
ossFile.setFileName(fileUrl[length - 1]);
}
AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addStandardsFile", null, ossFiles);
}
}
/**
* 工作组创建会议通知
*
@@ -228,6 +257,18 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
//编辑标协会议
if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
stableCrossTrainingService.edit(payMeeting, hotelContactsList);
List<String> fileIdList = new ArrayList<>();
String meetingFiles = payMeeting.getMeetingFiles();
if (StrUtil.isNotBlank(meetingFiles)){
List<String> strings = Arrays.asList(meetingFiles.split(","));
List<String> arrayList = new ArrayList<>(strings);
fileIdList.addAll(arrayList);
}
String paymentQrCode = payMeeting.getPaymentQrCode();
if (StrUtil.isNotBlank(paymentQrCode)){
fileIdList.add(paymentQrCode);
}
pushStandardsFiles(fileIdList);
}
}
@@ -590,14 +631,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
}
//如果是标协会议就同步文件
if (meetingCommon.equals(MeetingCommon.STANDARD_MEETING_INT)) {
List<OSSFile> ossFiles = iossFileService.listByIds(meetingFileIdList);
for (OSSFile ossFile : ossFiles) {
String url = ossFile.getUrl();
String[] fileUrl = url.split("/");
int length = fileUrl.length;
ossFile.setFileName(fileUrl[length - 1]);
}
AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addStandardsFile", null, ossFiles);
pushStandardsFiles(meetingFileIdList);
StableCrossTraining stableCrossTraining = new StableCrossTraining();
stableCrossTraining.setId(id);
stableCrossTraining.setMeetingFiles(fileIds);
jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
+2 -24
View File
@@ -77,26 +77,14 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
stableCrossTraining.setConvokeEndTime(endTime);
stableCrossTraining.setConvokeLocale(payMeeting.getConvokeLocale());
stableCrossTraining.setPlaceName(payMeeting.getVenue());
List<String> fileIdList = new ArrayList<>();
String meetingData = payMeeting.getMeetingData();
stableCrossTraining.setMeetingFiles(meetingData);
if (StrUtil.isNotBlank(meetingData)){
List<String> strings = Arrays.asList(meetingData.split(","));
List<String> arrayList = new ArrayList<>(strings);
fileIdList.addAll(arrayList);
}
String meetingFiles = payMeeting.getMeetingFiles();
stableCrossTraining.setMeetingNotifyFiles(meetingFiles);
if (StrUtil.isNotBlank(meetingFiles)){
List<String> strings = Arrays.asList(meetingFiles.split(","));
List<String> arrayList = new ArrayList<>(strings);
fileIdList.addAll(arrayList);
}
String paymentQrCode = payMeeting.getPaymentQrCode();
stableCrossTraining.setPaymentQrCode(paymentQrCode);
if (StrUtil.isNotBlank(paymentQrCode)){
fileIdList.add(paymentQrCode);
}
stableCrossTraining.setAddress(payMeeting.getAddress());
stableCrossTraining.setEstimatedNumber(payMeeting.getEstimatedNumber());
@@ -125,16 +113,6 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
hotelList.add(hotelContact);
}
stableCrossTraining.setHotelList(hotelList);
if (!fileIdList.isEmpty()) {
List<OSSFile> ossFiles = iossFileService.listByIds(fileIdList);
for (OSSFile ossFile : ossFiles) {
String url = ossFile.getUrl();
String[] fileUrl = url.split("/");
int length = fileUrl.length;
ossFile.setFileName(fileUrl[length - 1]);
}
AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addStandardsFile",null,ossFiles);
}
return stableCrossTraining;
}