add 需要上传汇款凭证/后四位订单编号的用户也发送消息
This commit is contained in:
+12
-9
@@ -291,14 +291,17 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
|||||||
judgeSend(payMeeting, payMeetingSituation1, isSubItem);
|
judgeSend(payMeeting, payMeetingSituation1, isSubItem);
|
||||||
} else {
|
} else {
|
||||||
Integer payMode = payMeetingSituation.getPayMode();
|
Integer payMode = payMeetingSituation.getPayMode();
|
||||||
//不是汇款和线上缴费
|
boolean payModeBoolean = Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) || Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2);
|
||||||
boolean payModeBoolean = !Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) && !Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2);
|
//汇款或线上缴费
|
||||||
if (payModeBoolean) {
|
if (payModeBoolean) {
|
||||||
|
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG3, "C_OPEN_TYPE3");
|
||||||
|
//汇款或线上缴费
|
||||||
|
}else {
|
||||||
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4");
|
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//上传付款凭证发送邮件提醒审批
|
//上传付款凭证发送邮件提醒审批
|
||||||
SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
|
//SendPaymentRecordMessage(payMeetingSituation1, payMeeting); 报名不上传付款凭证
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -308,17 +311,17 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
|||||||
*/
|
*/
|
||||||
private void judgeSend(PayMeeting payMeeting, PayMeetingSituation payMeetingSituation, boolean isSubItem) {
|
private void judgeSend(PayMeeting payMeeting, PayMeetingSituation payMeetingSituation, boolean isSubItem) {
|
||||||
Integer payMode = payMeetingSituation.getPayMode();
|
Integer payMode = payMeetingSituation.getPayMode();
|
||||||
//不是汇款和线上缴费
|
//汇款或线上缴费
|
||||||
boolean payModeBoolean = !Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) && !Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2);
|
boolean payModeBoolean = Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) || Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2);
|
||||||
//工作组成员
|
//工作组成员
|
||||||
if (isSubItem) {
|
if (isSubItem) {
|
||||||
//不是汇款和线上缴费
|
//不是汇款或线上缴费
|
||||||
if (payModeBoolean) {
|
if (!payModeBoolean) {
|
||||||
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4");
|
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
//不是汇款和线上缴费
|
//不是汇款或线上缴费
|
||||||
if (payModeBoolean) {
|
if (!payModeBoolean) {
|
||||||
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG2, "C_OPEN_TYPE2");
|
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG2, "C_OPEN_TYPE2");
|
||||||
} else {
|
} else {
|
||||||
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG3, "C_OPEN_TYPE3");
|
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG3, "C_OPEN_TYPE3");
|
||||||
|
|||||||
Reference in New Issue
Block a user