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

fix 添加参会人 非打包情况 需要发票时校验邮寄，不需要时不校验

Browse Source
This commit is contained in:
lijiarao
2021-10-21 16:54:00 +08:00
parent aeaef6cab3
commit 278a446e57
1 changed files with 20 additions and 13 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/PayMeetingSituationServiceImpl.java
+20 -13
View File
@@ -882,7 +882,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//缴费方式为汇款或线上缴费 //缴费方式为汇款或线上缴费
} else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) } else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
|| Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)) { || Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)) {
ValidUtil.validate(commonPeopleVO, NotPack.class); Integer needInvoice = commonPeopleVO.getNeedInvoice();
//需要发票时校验邮寄
if (!needInvoice.equals(ProjectCommon.NEED_INVOICE0)){
ValidUtil.validate(commonPeopleVO, NotPack.class);
}
String paymentRecord = payMeetingSituation.getPaymentRecord(); String paymentRecord = payMeetingSituation.getPaymentRecord();
String orderCode = payMeetingSituation.getOrderCode(); String orderCode = payMeetingSituation.getOrderCode();
//优先判断合同 判断是否为合同添加的参会人 //优先判断合同 判断是否为合同添加的参会人
@@ -929,18 +933,21 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts()); payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
} }
ValidUtil.validate(commonPeopleVO); ValidUtil.validate(commonPeopleVO);
//校验邮寄联系人 //需要发票时校验邮寄
String postContactId = commonPeopleVO.getPostContactId(); if (!needInvoice.equals(ProjectCommon.NEED_INVOICE0)){
PayContactsManagement postContact = contactsManagementService.getById(postContactId); //校验邮寄联系人
//校验是否是选择的企业的联系人 String postContactId = commonPeopleVO.getPostContactId();
String companyId2 = postContact.getCompanyId(); PayContactsManagement postContact = contactsManagementService.getById(postContactId);
if (companyId2.equals(companyId)) { //校验是否是选择的企业的联系人
payMeetingSituation1.setPostContactId(postContact.getId()); String companyId2 = postContact.getCompanyId();
payMeetingSituation1.setPostContactName(postContact.getName()); if (companyId2.equals(companyId)) {
payMeetingSituation1.setPostContactAddress(payMeetingSituation.getPostContactAddress()); payMeetingSituation1.setPostContactId(postContact.getId());
payMeetingSituation1.setPostCode(payMeetingSituation.getPostCode()); payMeetingSituation1.setPostContactName(postContact.getName());
} else { payMeetingSituation1.setPostContactAddress(payMeetingSituation.getPostContactAddress());
throw new JeroBootException("邮寄联系人不是所选企业的企业联系人"); payMeetingSituation1.setPostCode(payMeetingSituation.getPostCode());
} else {
throw new JeroBootException("邮寄联系人不是所选企业的企业联系人");
}
} }
payMeetingSituation1.setCheckInHotel(payMeetingSituation.getCheckInHotel()); payMeetingSituation1.setCheckInHotel(payMeetingSituation.getCheckInHotel());
payMeetingSituation1.setArrivalTime(payMeetingSituation.getArrivalTime()); payMeetingSituation1.setArrivalTime(payMeetingSituation.getArrivalTime());