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

fix bug 41748 我的消息--工作组/分标委成员单位汇款或线上缴费收不到消息

Browse Source 
fix bug 41754 对接人修改参会人信息时，没做修改直接确定，报提示
This commit is contained in:
lijiarao
2021-10-29 19:03:04 +08:00
parent b2ed99b4f9
commit 5372f5b8c4
1 changed files with 10 additions and 2 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
+10 -2
View File
@@ -352,6 +352,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//不是汇款或线上缴费 //不是汇款或线上缴费
if (!payModeBoolean) { if (!payModeBoolean) {
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4"); sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4");
}else {
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG3, "C_OPEN_TYPE3");
} }
} else { } else {
//不是汇款或线上缴费 //不是汇款或线上缴费
@@ -847,7 +849,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//要保存的对象 //要保存的对象
PayMeetingSituation payMeetingSituation1 = new PayMeetingSituation(); PayMeetingSituation payMeetingSituation1 = new PayMeetingSituation();
payMeetingSituation1.setAmountReceivable(new BigDecimal("0")); payMeetingSituation1.setAmountReceivable(new BigDecimal("0"));
payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1); if (!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)
&&!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_2)) {
payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
}
//会议校验基础类 //会议校验基础类
MeetingEntity meetingEntity = new MeetingEntity(); MeetingEntity meetingEntity = new MeetingEntity();
BeanUtils.copyProperties(payMeetingSituation, meetingEntity); BeanUtils.copyProperties(payMeetingSituation, meetingEntity);
@@ -966,7 +971,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
} }
} }
payMeetingSituation1.setPaymentRecord(paymentRecord); payMeetingSituation1.setPaymentRecord(paymentRecord);
if (!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)
&&!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_2)) {
payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
}
payMeetingSituation1.setOrderCode(orderCode); payMeetingSituation1.setOrderCode(orderCode);
payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice()); payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());