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

缴费审核

Browse Source
This commit is contained in:
baozhipeng
2021-12-16 18:07:10 +08:00
parent eb32827f03
commit bf0738493f
4 changed files with 84 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java
+1 -1
View File
@@ -137,7 +137,7 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
LambdaQueryWrapper<PayPaymentRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayPaymentRecord::getProjectId, id);
wrapper.eq(PayPaymentRecord::getPaymentStatus, PaymentStatusEnum.COMPLETED.getCode());
wrapper.orderByAsc(PayPaymentRecord::getCreateTime);
wrapper.orderByAsc(PayPaymentRecord::getPaymentDate);
List<PayPaymentRecord> list = payPaymentRecordService.list(wrapper);
return Result.OK(list);
jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java
+2 -1
View File
@@ -2,6 +2,7 @@ package com.jero.payment.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -102,7 +103,7 @@ public class PayPaymentRecord implements Serializable {
private String reviewerName;
@ApiModelProperty(value = "审核时间")
private String reviewTime;
private Date reviewTime;
@ApiModelProperty(value = "审核说明")
private String reviewInstructions;
jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java
+2 -1
View File
@@ -20,6 +20,7 @@ import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 来款记录子表，记录每次审核
@@ -103,7 +104,7 @@ public class PayPaymentRecordSub implements Serializable {
private String reviewerName;
@ApiModelProperty(value = "审核时间")
private String reviewTime;
private Date reviewTime;
@ApiModelProperty(value = "审核说明")
private String reviewInstructions;
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
+79 -41
View File
@@ -2,6 +2,7 @@ package com.jero.payment.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.common.ProjectCommon;
import com.jero.common.common.RoleCommon;
@@ -32,6 +33,7 @@ import com.jero.payment.mapper.PayPaymentRecordMapper;
import com.jero.payment.service.IPayPaymentCheckService;
import com.jero.payment.service.IPayPaymentRecordService;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.mapper.PayCommonProjectMapper;
import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
@@ -91,7 +93,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
//列表
LambdaQueryWrapper<PayPaymentRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayPaymentRecord::getProjectId, id);
wrapper.orderByDesc(PayPaymentRecord::getCreateTime);
wrapper.orderByAsc(PayPaymentRecord::getPaymentDate);
List<PayPaymentRecord> list = payPaymentRecordService.list(wrapper);
list.forEach(p-> {
if(StringUtils.isNotBlank(p.getPaymentStatus())){
@@ -142,7 +144,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
//列表
LambdaQueryWrapper<PayPaymentRecordSub> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayPaymentRecordSub::getProjectId, id);
wrapper.orderByDesc(PayPaymentRecordSub::getCreateTime);
wrapper.orderByAsc(PayPaymentRecordSub::getPaymentDate);
List<PayPaymentRecordSub> list = payPaymentCheckService.list(wrapper);
list.forEach(p -> {
if (StringUtils.isNotBlank(p.getPaymentStatus())) {
@@ -168,6 +170,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
throw new JeroBootException("有待完成的阶段信息");
}
String projectId;
String projectName;
switch (String.valueOf(payPaymentRecord.getProjectType())){
// 普通项目
@@ -179,7 +183,9 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
payCommonProject.setId(payPaymentRecord.getProjectId());
payCommonProject.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
payCommonProjectMapper.updateById(payCommonProject);
//
// projectId = payCommonProject.getId();
// projectName=payCommonProject.getChargeProject();
break;
// 工作组项目
case PayIncomeContractCommon.PROJECT_TYPE2:
@@ -187,10 +193,14 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
PayWorkingGroupSubItem payWorking = new PayWorkingGroupSubItem();
// PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorking.getWorkingGroupId());
payWorking.setId(payPaymentRecord.getProjectId());
payWorking.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
payWorkingGroupSubItemMapper.updateById(payWorking);
// projectId = payWorking.getId();
// projectName=payWorking.getChargeProject();
break;
//会议项目
case PayIncomeContractCommon.PROJECT_TYPE3:
@@ -201,7 +211,9 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
meeting.setId(payPaymentRecord.getProjectId());
meeting.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
payMeetingSituationMapper.updateById(meeting);
//
// projectId = meeting.getId();
// projectName=meeting.getChargeProject();
break;
//会员项目
case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -253,6 +265,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
payPaymentRecordSub.setRecordId(payPaymentRecord.getId());
BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
payPaymentCheckMapper.insert(payPaymentRecordSub);
// uploadSendMessage();
}
/**
* @Description 企业人员上传完汇款凭证之后 来款管理者 给财务人员 发送消息
@@ -339,21 +353,20 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
payPaymentRecord.setReviewerId(sysUser.getId());
payPaymentRecord.setReviewerName(sysUser.getRealname());
payPaymentRecord.setReviewTime(new Date());
payPaymentRecordMapper.updateById(payPaymentRecord);
//新增来款记录表子表
PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
payPaymentRecordSub.setRecordId(payPaymentRecord.getId());
BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
payPaymentCheckMapper.insert(payPaymentRecordSub);
//拒绝
if(PaymentStatusEnum.REJECTED.getCode().equals(payPaymentRecord.getPaymentStatus())){
return;
}
payPaymentRecordSub.setId(null);
LambdaUpdateWrapper<PayPaymentRecordSub> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(PayPaymentRecordSub::getRecordId,payPaymentRecord.getId());
wrapper.eq(PayPaymentRecordSub::getProjectId,payPaymentRecord.getProjectId());
payPaymentCheckMapper.update(payPaymentRecordSub,wrapper);
//通过
BigDecimal newPaidAmount;
Integer inAccount;
String paymentStatus;
@@ -367,14 +380,19 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
PayCommonProject payCommonProject = payCommonProjectMapper.selectById(payPaymentRecord.getProjectId());
newPaidAmount =payPaymentRecordService.addPaidAmount(payCommonProject.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = payPaymentRecordService.getInAccount(payCommonProject.getReceivableAmount(), newPaidAmount);//到账状态
paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
//已同意
newPaidAmount = payPaymentRecordService.addPaidAmount(payCommonProject.getPaidAmount(), payPaymentRecord.getAmountReceived());//累加实收
inAccount = payPaymentRecordService.getInAccount(payCommonProject.getReceivableAmount(), newPaidAmount);//到账状态
payCommonProject.setPaidAmount(newPaidAmount);
payCommonProject.setInAccount(inAccount);
paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
}else{
paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), payCommonProject.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
}
//更新主列表
payCommonProject.setPaidAmount(newPaidAmount);
payCommonProject.setInAccount(inAccount);
payCommonProject.setPaymentStatus(paymentStatus);
//更新主列表
payCommonProjectMapper.updateById(payCommonProject);
break;
@@ -385,14 +403,19 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
PayWorkingGroupSubItem payWorking = payWorkingGroupSubItemMapper.selectById(payPaymentRecord.getProjectId());
newPaidAmount =payPaymentRecordService.addPaidAmount(payWorking.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = payPaymentRecordService.getInAccount(payWorking.getReceivableAmount(), newPaidAmount);//到账状态
paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
//已同意
newPaidAmount =payPaymentRecordService.addPaidAmount(payWorking.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = payPaymentRecordService.getInAccount(payWorking.getReceivableAmount(), newPaidAmount);//到账状态
payWorking.setPaidAmount(newPaidAmount);
payWorking.setInAccount(inAccount);
paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
}else{
paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), payWorking.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
}
//更新主列表
payWorking.setPaidAmount(newPaidAmount);
payWorking.setInAccount(inAccount);
payWorking.setPaymentStatus(paymentStatus);
//更新主列表
payWorkingGroupSubItemMapper.updateById(payWorking);
break;
@@ -403,14 +426,19 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
PayMeetingSituation meeting = payMeetingSituationMapper.selectById(payPaymentRecord.getProjectId());
newPaidAmount =payPaymentRecordService.addPaidAmount(meeting.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = payPaymentRecordService.getInAccount(meeting.getAmountReceivable(), newPaidAmount);//到账状态
paymentStatus = getPaymentStatus(meeting.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
//已同意
newPaidAmount =payPaymentRecordService.addPaidAmount(meeting.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = payPaymentRecordService.getInAccount(meeting.getAmountReceivable(), newPaidAmount);//到账状态
meeting.setPaidAmount(newPaidAmount);
meeting.setInAccount(inAccount);
paymentStatus = getPaymentStatus(meeting.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
}else{
paymentStatus = getPaymentStatus(meeting.getAmountReceivable(), meeting.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
}
//更新主列表
meeting.setPaidAmount(newPaidAmount);
meeting.setInAccount(inAccount);
meeting.setPaymentStatus(paymentStatus);
//更新主列表
payMeetingSituationMapper.updateById(meeting);
break;
@@ -421,14 +449,19 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
PayMemberProjectSubitem member = payMemberProjectSubitemMapper.selectById(payPaymentRecord.getProjectId());
newPaidAmount =payPaymentRecordService.addPaidAmount(member.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = payPaymentRecordService.getInAccount(member.getAmountReceivable(), newPaidAmount);//到账状态
paymentStatus = getPaymentStatus(member.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
//已同意
newPaidAmount =payPaymentRecordService.addPaidAmount(member.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = payPaymentRecordService.getInAccount(member.getAmountReceivable(), newPaidAmount);//到账状态
member.setPaidAmount(newPaidAmount);
member.setInAccount(inAccount);
paymentStatus = getPaymentStatus(member.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
}else{
paymentStatus = getPaymentStatus(member.getAmountReceivable(), member.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
}
//更新主列表
member.setPaidAmount(newPaidAmount);
member.setInAccount(inAccount);
member.setPaymentStatus(paymentStatus);
//更新主列表
payMemberProjectSubitemMapper.updateById(member);
break;
@@ -441,14 +474,19 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
TbMemberProjectSubitem tbMember = tbMemberProjectSubitemMapper.selectById(payPaymentRecord.getProjectId());
newPaidAmount =payPaymentRecordService.addPaidAmount(tbMember.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = payPaymentRecordService.getInAccount(tbMember.getAmountReceivable(), newPaidAmount);//到账状态
paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
//已同意
newPaidAmount =payPaymentRecordService.addPaidAmount(tbMember.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = payPaymentRecordService.getInAccount(tbMember.getAmountReceivable(), newPaidAmount);//到账状态
tbMember.setPaidAmount(newPaidAmount);
tbMember.setInAccount(inAccount);
paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
}else{
paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), tbMember.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
}
//更新主列表
tbMember.setPaidAmount(newPaidAmount);
tbMember.setInAccount(inAccount);
tbMember.setPaymentStatus(paymentStatus);
//更新主列表
tbMemberProjectSubitemMapper.updateById(tbMember);
break;