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

Merge remote-tracking branch 'origin/master' into 缴费变更

Browse Source
This commit is contained in:
lijiarao
2022-08-01 10:06:25 +08:00
parent a4b02a3566 29da3a047a
commit f6ce0e10a5
1 changed files with 10 additions and 6 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 -6
View File
@@ -482,10 +482,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (!registerCheckResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) { if (!registerCheckResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
throw new JeroBootException("报名信息未审核通过"); throw new JeroBootException("报名信息未审核通过");
} }
String paymentRecord = payMeetingSituation.getPaymentRecord(); //String paymentRecord = payMeetingSituation.getPaymentRecord();
if (StrUtil.isBlank(paymentRecord)) { //if (StrUtil.isBlank(paymentRecord)) {
throw new JeroBootException("缴费凭证为空不能审核"); // throw new JeroBootException("缴费凭证为空不能审核");
} //}
Integer oldCheckResult = payMeetingSituation.getCheckResult(); Integer oldCheckResult = payMeetingSituation.getCheckResult();
if (oldCheckResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) { if (oldCheckResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
throw new JeroBootException("审核通过之后就无法在审核"); throw new JeroBootException("审核通过之后就无法在审核");
@@ -496,6 +496,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
Integer registerProcess = payMeetingSituation.getRegisterProcess(); Integer registerProcess = payMeetingSituation.getRegisterProcess();
if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_2)) { if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_2)) {
payMeetingSituation.setCheckRemark(checkRemark); payMeetingSituation.setCheckRemark(checkRemark);
if (Objects.equals(registerProcess,3)||Objects.equals(registerProcess,8)){
throw new JeroBootException("提前审核无法驳回");
}
if (Objects.equals(registerProcess,4)){ if (Objects.equals(registerProcess,4)){
payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_5); payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_5);
}else if (Objects.equals(registerProcess,9)){ }else if (Objects.equals(registerProcess,9)){
@@ -510,9 +514,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//payMeetingSituation.setInAccount(PayProjectCommon.YES); //payMeetingSituation.setInAccount(PayProjectCommon.YES);
//设置实收金额 //设置实收金额
//payMeetingSituation.setPaidAmount(payMeetingSituation.getAmountReceivable()); //payMeetingSituation.setPaidAmount(payMeetingSituation.getAmountReceivable());
if (Objects.equals(registerProcess,4)||Objects.equals(registerProcess,5)){ if (Objects.equals(registerProcess,3)||Objects.equals(registerProcess,4)||Objects.equals(registerProcess,5)){
payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_6); payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_6);
}else if (Objects.equals(registerProcess,9)||Objects.equals(registerProcess,10)){ }else if (Objects.equals(registerProcess,8)||Objects.equals(registerProcess,9)||Objects.equals(registerProcess,10)){
payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_11); payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_11);
} }
payMeetingSituation.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode()); payMeetingSituation.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());