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

fix 88309 【所有会议】企业端--报名后缴费方式从打包切换成汇款/需要缴费--到账开票的状态和审核按钮没有同步

Browse Source
This commit is contained in:
lijiarao
2024-08-09 14:20:46 +08:00
parent 929e7fec9d
commit 924b1b09bb
3 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java
+7 -7
View File
@@ -94,7 +94,7 @@ public class MeetingSubitemCommon {
*/
public static final Integer SIGNUP_STATUS_2 = 2;
/**
* 需要缴费-非成员已报名审核
* 需要缴费-非成员已报名待审核
*/
public static final Integer REGISTER_PROCESS_1 = 1;
/**
@@ -102,7 +102,7 @@ public class MeetingSubitemCommon {
*/
public static final Integer REGISTER_PROCESS_2 = 2;
/**
* 需要缴费-付款方式为汇款现场缴费
* 需要缴费-付款方式为汇款现场缴费 待上传凭证
*/
public static final Integer REGISTER_PROCESS_3 = 3;
/**
@@ -122,23 +122,23 @@ public class MeetingSubitemCommon {
*/
public static final Integer REGISTER_PROCESS_7 = 7;
/**
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-待上传凭证
*/
public static final Integer REGISTER_PROCESS_8 = 8;
/**
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-凭证待审核
*/
public static final Integer REGISTER_PROCESS_9 = 9;
/**
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-凭证被拒绝
*/
public static final Integer REGISTER_PROCESS_10 = 10;
/**
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-缴费成功
*/
public static final Integer REGISTER_PROCESS_11 = 11;
/**
* 不需要缴费-非成员已报名审核
* 不需要缴费-非成员已报名待审核
*/
public static final Integer REGISTER_PROCESS_12 = 12;
/**
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+7 -5
View File
@@ -29,6 +29,7 @@ import com.jero.data.service.IPayCaseCommitteeService;
import com.jero.data.service.IPayCaseCommitteeSubitemService;
import com.jero.data.service.IPayCaseCouncilSubitemService;
import com.jero.meeting.common.MeetingCommon;
import com.jero.meeting.common.MeetingSubitemCommon;
import com.jero.meeting.entity.*;
import com.jero.meeting.mapper.PayMeetingGuestsFileMapper;
import com.jero.meeting.service.*;
@@ -184,6 +185,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
Integer checkResult = meetingSituation.getCheckResult();
String paymentRecord = meetingSituation.getPaymentRecord();
Integer checkIn = meetingSituation.getCheckIn();
Integer registerProcess = meetingSituation.getRegisterProcess();
//报名信息审核中：非成员单位需要审核的
if (Objects.equals(registerCheckResult, 0)) {
meeting.setSignUpStatus(1);
@@ -196,9 +198,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
} else if (Objects.equals(registerCheckResult, 2)) {
meeting.setSignUpStatus(3);
// 待上传凭证：来款方式为：汇款/线上缴费。需要上传审核凭证的
} else if (Objects.equals(registerCheckResult, 1)
&& StringUtils.isBlank(paymentRecord)
&& !Objects.equals(checkResult, 1)) {
} else if (registerProcess.equals(MeetingSubitemCommon.REGISTER_PROCESS_3)
|| registerProcess.equals(MeetingSubitemCommon.REGISTER_PROCESS_8)) {
meeting.setSignUpStatus(4);
// 凭证被拒绝：来款方式为：汇款/线上缴费。上传审核凭证被拒绝的
} else if (Objects.equals(checkResult, 2)) {
@@ -206,8 +207,9 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
//签到成功的
} else if (Objects.equals(checkIn, 1)) {
meeting.setSignUpStatus(7);
// 报名成功：不需要审核直接报名成功的;审核凭证通过的
} else if (Objects.equals(checkResult, 1)) {
// 待签到 报名成功：不需要审核直接报名成功的;审核凭证通过的
} else if (registerProcess.equals(MeetingSubitemCommon.REGISTER_PROCESS_6)
||registerProcess.equals(MeetingSubitemCommon.REGISTER_PROCESS_14)) {
meeting.setSignUpStatus(6);
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+25 -9
View File
@@ -569,12 +569,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_2)) {
payMeetingSituation.setCheckRemark(checkRemark);
if (Objects.equals(registerProcess,3)||Objects.equals(registerProcess,8)){
if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_3)
||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_8)){
throw new JeroBootException("提前审核无法驳回");
}
if (Objects.equals(registerProcess,4)){
if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_4)){
payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_5);
}else if (Objects.equals(registerProcess,9)){
}else if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_9)){
payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_10);
}
payMeetingSituation.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
@@ -586,9 +587,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//payMeetingSituation.setInAccount(PayProjectCommon.YES);
//设置实收金额
//payMeetingSituation.setPaidAmount(payMeetingSituation.getAmountReceivable());
if (Objects.equals(registerProcess,3)||Objects.equals(registerProcess,4)||Objects.equals(registerProcess,5)){
if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_3)
||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_4)
||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_5)){
payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_6);
}else if (Objects.equals(registerProcess,8)||Objects.equals(registerProcess,9)||Objects.equals(registerProcess,10)){
}else if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_8)
||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_9)
||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_10)){
payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_11);
}
payMeetingSituation.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
@@ -852,11 +857,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
meetingSituation.setCheckFile(signInVO.getFileId());
meetingSituation.setCheckInTime(new Date());
Integer registerProcess = meetingSituation.getRegisterProcess();
if (Objects.equals(registerProcess,3)){
if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_3)){
meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_7);
}else if (Objects.equals(registerProcess,6)){
}else if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_6)){
meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_7);
}else if (Objects.equals(registerProcess,14)){
}else if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_14)){
meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_15);
}
saveOrUpdate(meetingSituation);
@@ -1430,6 +1435,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
}
//展示的流程图
String situationId = payMeetingSituation.getId();
if (payMeetingSituation1.getIsZero()) {
//如果报名信息审核通过就直接待签到
if (payMeetingSituation1.getRegisterCheckResult().equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
@@ -1437,9 +1443,19 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}else {
payMeetingSituation1.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_12);
}
LambdaUpdateWrapper<PayMeetingSituation> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(PayMeetingSituation::getId,situationId);
updateWrapper.set(PayMeetingSituation::getPaymentStatus,null);
this.update(updateWrapper);
}else {
if (payMeetingSituation.getId() == null){
if (situationId == null){
payMeetingSituation1.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
}else {
PayMeetingSituation old = this.getById(situationId);
Integer oldPayMode = old.getPayMode();
if (MeetingSubitemCommon.PAY_MODE_3.equals(oldPayMode)){
payMeetingSituation1.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
}
}
if (Objects.equals(payMeetingSituation1.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
payMeetingSituation1.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_3);