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

fix 参会人审核无法通过

Browse Source
This commit is contained in:
lijiarao
2021-09-22 19:06:02 +08:00
parent 5bfc752950
commit 57f172b34b
2 changed files with 24 additions and 26 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
+18 -20
View File
@@ -48,10 +48,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -207,22 +204,23 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
Integer checkResult = checkVO.getCheckResult();
if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_2)) {
//TODO 提示信息
}else {
//设置到账
//meetingSituation.setInAccount(PayProjectCommon.YES);
//设置实收金额
//meetingSituation.setPaidAmount(meetingSituation.getAmountReceivable());
meetingSituation.setCheckResult(checkResult);
saveOrUpdate(meetingSituation);
List<PayPaymentRecord> payPaymentRecords = new ArrayList<>();
PayPaymentRecord payPaymentRecord = new PayPaymentRecord();
payPaymentRecord.setProjectId(meetingSituation.getId());
payPaymentRecord.setProjectType(Integer.parseInt(PayIncomeContractCommon.PROJECT_TYPE3));
payPaymentRecord.setAmountReceived(meetingSituation.getAmountReceivable());
payPaymentRecord.setPaymentDate(new Date());
payPaymentRecords.add(payPaymentRecord);
//添加来款
payPaymentRecordService.addAmountReceived(payPaymentRecords);
}
//设置到账
meetingSituation.setInAccount(PayProjectCommon.YES);
//设置实收金额
meetingSituation.setPaidAmount(meetingSituation.getAmountReceivable());
meetingSituation.setCheckResult(checkResult);
saveOrUpdate(meetingSituation);
List<PayPaymentRecord> payPaymentRecords = new ArrayList<>();
PayPaymentRecord payPaymentRecord = new PayPaymentRecord();
payPaymentRecord.setProjectId(meetingSituation.getId());
payPaymentRecord.setProjectType(Integer.parseInt(PayIncomeContractCommon.PROJECT_TYPE3));
payPaymentRecord.setAmountReceived(meetingSituation.getAmountReceivable());
payPaymentRecord.setPaymentDate(new Date());
payPaymentRecords.add(payPaymentRecord);
//添加来款
payPaymentRecordService.addAmountReceived(payPaymentRecords);
}
@Override
@@ -346,7 +344,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
//如果是线上缴费并且缴费凭证为空
Integer payMode = meetingSituation.getPayMode();
if (payMode.equals(2)&& StringUtils.isBlank(meetingSituation.getPaymentRecord())){
if (Objects.equals(payMode,2) && StringUtils.isBlank(meetingSituation.getPaymentRecord())){
throw new JeroBootException("请上传缴费凭证后再签到");
}
jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
+6 -6
View File
@@ -231,11 +231,11 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
//校验来款方式
Integer paymentMethod = payMemberProjectSubitem.getPaymentMethod();
//合同
if (paymentMethod.equals(2)){
if (Objects.equals(paymentMethod,2)){
ValidUtil.validate(payMemberProjectSubitem, Contract.class);
}
//收费通知
if (paymentMethod.equals(3)){
if (Objects.equals(paymentMethod,3)){
ValidUtil.validate(payMemberProjectSubitem, ChargeNotice.class);
}
}
@@ -283,11 +283,11 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
//校验来款方式
Integer paymentMethod = payMemberProjectSubitem.getPaymentMethod();
//合同
if (paymentMethod.equals(2)){
if (Objects.equals(paymentMethod,2)){
ValidUtil.validate(payMemberProjectSubitem, Contract.class);
}
//收费通知
if (paymentMethod.equals(3)){
if (Objects.equals(paymentMethod,3)){
ValidUtil.validate(payMemberProjectSubitem, ChargeNotice.class);
}
}
@@ -331,11 +331,11 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
//校验来款方式
Integer paymentMethod = payMemberProjectSubitem.getPaymentMethod();
//合同
if (paymentMethod.equals(2)){
if (Objects.equals(paymentMethod,2)){
ValidUtil.validate(payMemberProjectSubitem, Contract.class);
}
//收费通知
if (paymentMethod.equals(3)){
if (Objects.equals(paymentMethod,3)){
ValidUtil.validate(payMemberProjectSubitem, ChargeNotice.class);
}
}