fix bug 41748 我的消息--工作组/分标委成员单位汇款或线上缴费收不到消息
fix bug 41754 对接人修改参会人信息时,没做修改直接确定,报提示
This commit is contained in:
+10
-2
@@ -352,6 +352,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
//不是汇款或线上缴费
|
||||
if (!payModeBoolean) {
|
||||
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4");
|
||||
}else {
|
||||
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG3, "C_OPEN_TYPE3");
|
||||
}
|
||||
} else {
|
||||
//不是汇款或线上缴费
|
||||
@@ -847,7 +849,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
//要保存的对象
|
||||
PayMeetingSituation payMeetingSituation1 = new PayMeetingSituation();
|
||||
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();
|
||||
BeanUtils.copyProperties(payMeetingSituation, meetingEntity);
|
||||
@@ -966,7 +971,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
}
|
||||
}
|
||||
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.setNeedInvoice(payMeetingSituation.getNeedInvoice());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user