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

update 参会人发票信息没有保存上

Browse Source
This commit is contained in:
lijiarao
2023-07-20 10:27:32 +08:00
parent 16986ebafc
commit 536df97fb7
3 changed files with 19 additions and 9 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
+12 -9
View File
@@ -1,6 +1,5 @@
package com.jero.meeting.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -60,7 +59,6 @@ import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining;
import com.jero.standards.xuanguan.stablecrosstraining.service.IStableCrossTrainingService;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.util.CollectionUtils;
import org.jetbrains.annotations.NotNull;
@@ -159,11 +157,12 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
);
meetingHotelContactsService.saveBatch(hotelContactsList);
}
Integer meetingType = payMeeting.getMeetingType();
//会议联系人
List<PayMeetingContacts> meetingContactsList = payMeetingVO.getMeetingContactsList();
addMeetingContactsList(meetingContactsList, payMeeting.getId());
addMeetingContactsList(meetingContactsList, payMeeting.getId(),meetingType.equals(MeetingCommon.STANDARD_MEETING_INT));
//新增会员系统标协会议
if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)) {
String directorId = payMeeting.getDirectorId();
LoginUser loginUser = sysBaseAPI.getUserById(directorId);
payMeeting.setDirectorName(loginUser.getRealname());
@@ -260,9 +259,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
);
meetingHotelContactsService.saveBatch(hotelContactsList);
}
Integer meetingType = meeting.getMeetingType();
//会议联系人
List<PayMeetingContacts> meetingContactsList = payMeeting.getMeetingContactsList();
addMeetingContactsList(meetingContactsList, payMeeting.getId());
addMeetingContactsList(meetingContactsList, payMeeting.getId(), meetingType.equals(MeetingCommon.STANDARD_MEETING_INT));
}
public void delWithStandardForUpdate(PayMeeting payMeeting){
@@ -318,11 +318,12 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
);
meetingHotelContactsService.saveBatch(hotelContactsList);
}
Integer meetingType = payMeeting.getMeetingType();
//会议联系人
List<PayMeetingContacts> meetingContactsList = payMeetingVO.getMeetingContactsList();
addMeetingContactsList(meetingContactsList, payMeeting.getId());
addMeetingContactsList(meetingContactsList, payMeeting.getId(), meetingType.equals(MeetingCommon.STANDARD_MEETING_INT));
//编辑标协会议
if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
String directorId = payMeeting.getDirectorId();
LoginUser loginUser = sysBaseAPI.getUserById(directorId);
payMeeting.setDirectorName(loginUser.getRealname());
@@ -345,7 +346,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
/**
* 增加会议联系人
*/
private void addMeetingContactsList(List<PayMeetingContacts> meetingContactsList, String meetingId) {
private void addMeetingContactsList(List<PayMeetingContacts> meetingContactsList, String meetingId, boolean needPushStandard) {
if (meetingContactsList == null) {
return;
@@ -374,7 +375,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
meetingContacts.setMeetingId(meetingId)
);
meetingContactsService.saveBatch(addMeetingContactsList);
AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addMeetingContactsList",null,addMeetingContactsList);
if (needPushStandard){
AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addMeetingContactsList",null,addMeetingContactsList);
}
}
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+1
View File
@@ -1189,6 +1189,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
} else {
ValidUtil.validate(updateInvoicePram, UpdateInvoicePram.needInvoice_2.class);
}
BeanUtils.copyProperties(updateInvoicePram, payMeetingSituation1);
}
String paymentRecord = payMeetingSituation.getPaymentRecord();
String orderCode = payMeetingSituation.getOrderCode();
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CommonPeopleVO.java
+6
View File
@@ -1,5 +1,6 @@
package com.jero.meeting.vo;
import com.jero.common.aspect.annotation.Dict;
import com.jero.meeting.valid.group.NotPack;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -55,4 +56,9 @@ public class CommonPeopleVO{
@ApiModelProperty(value = "缴费凭证")
private String paymentRecord;
/**发票项目*/
@Dict(dicCode = "invoice_project")
@ApiModelProperty(value = "发票项目")
private Integer invoiceProject;
}