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

fix:80847

Browse Source
This commit is contained in:
梁琦涛
2024-01-15 18:21:48 +08:00
parent 56bea7bbaa
commit 2d5331dda2
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
+23 -8
View File
@@ -247,14 +247,6 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
List<String> listMsg = new ArrayList<>(); List<String> listMsg = new ArrayList<>();
for (PayContactsManagementTemporary p : list) { for (PayContactsManagementTemporary p : list) {
try { try {
List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->
(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE4) ?
Objects.equals(item.getTemporaryContactsId(),p.getId()) :
Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listStr)){
continue;
}
// 发送消息 // 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO(); SendMessageDTO sendMessageDTO = new SendMessageDTO();
Integer sendEmailFlag = payWorkingGroupDistributionRecord.getSendEmailFlag(); Integer sendEmailFlag = payWorkingGroupDistributionRecord.getSendEmailFlag();
@@ -275,9 +267,32 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
sendMessageDTO.setBusType("C_OPEN_TYPE12"); sendMessageDTO.setBusType("C_OPEN_TYPE12");
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)){ if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)){
List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->
Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1) ?
Objects.equals(item.getTemporaryContactsId(),p.getId()) :
Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listStr)){
continue;
}
json.put("id",listStr.get(0).getSubId()); json.put("id",listStr.get(0).getSubId());
}else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)){ }else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)){
List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->
Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2) ?
Objects.equals(item.getTemporaryContactsId(),p.getId()) :
Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listStr)){
continue;
}
json.put("id",listStr.get(0).getProjectId()); json.put("id",listStr.get(0).getProjectId());
}else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4)){
List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->
Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4) ?
Objects.equals(item.getTemporaryContactsId(),p.getId()) :
Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listStr)){
continue;
}
json.put("id",listStr.get(0).getSubId());
} }
sendMessageDTO.setBusId(json.toJSONString()); sendMessageDTO.setBusId(json.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO); sendMessageService.SendMessageService(sendMessageDTO);