第一版,来款审核,除了发消息其他基本能跑通
This commit is contained in:
+29
-21
@@ -438,7 +438,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
|
|
||||||
BigDecimal newPaidAmount;
|
BigDecimal newPaidAmount;
|
||||||
Integer inAccount;
|
Integer inAccount;
|
||||||
String paymentStatus=PaymentStatusEnum.TO_BE_REVIEWED.getCode();
|
String paymentStatus;
|
||||||
String principalId="";
|
String principalId="";
|
||||||
String project="";
|
String project="";
|
||||||
List<PayContactsManagementTemporary> listId = new ArrayList<>();
|
List<PayContactsManagementTemporary> listId = new ArrayList<>();
|
||||||
@@ -453,6 +453,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
throw new JeroBootException("只有待审核的才可以审核");
|
throw new JeroBootException("只有待审核的才可以审核");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
principalId = payCommonProject.getPrincipalId();
|
||||||
|
project=payCommonProject.getChargeProject();
|
||||||
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
||||||
//已同意
|
//已同意
|
||||||
newPaidAmount = payPaymentRecordService.addPaidAmount(payCommonProject.getPaidAmount(), payPaymentRecord.getAmountReceived());//累加实收
|
newPaidAmount = payPaymentRecordService.addPaidAmount(payCommonProject.getPaidAmount(), payPaymentRecord.getAmountReceived());//累加实收
|
||||||
@@ -460,11 +462,12 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
payCommonProject.setPaidAmount(newPaidAmount);
|
payCommonProject.setPaidAmount(newPaidAmount);
|
||||||
payCommonProject.setInAccount(inAccount);
|
payCommonProject.setInAccount(inAccount);
|
||||||
paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
|
paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
|
||||||
|
//发消息
|
||||||
|
payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
|
||||||
}else{
|
}else{
|
||||||
paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), payCommonProject.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
|
paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), payCommonProject.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
|
||||||
//发消息参数
|
//发消息
|
||||||
principalId = payCommonProject.getId();
|
checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
|
||||||
project=payCommonProject.getChargeProject();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
payCommonProject.setPaymentStatus(paymentStatus);
|
payCommonProject.setPaymentStatus(paymentStatus);
|
||||||
@@ -481,6 +484,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
throw new JeroBootException("只有待审核的才可以审核");
|
throw new JeroBootException("只有待审核的才可以审核");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
principalId = payWorkingGroup.getPrincipalIdA();
|
||||||
|
project = payWorkingGroup.getWorkingGroupProject();
|
||||||
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
||||||
//已同意
|
//已同意
|
||||||
newPaidAmount =payPaymentRecordService.addPaidAmount(payWorking.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
|
newPaidAmount =payPaymentRecordService.addPaidAmount(payWorking.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
|
||||||
@@ -488,11 +493,12 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
payWorking.setPaidAmount(newPaidAmount);
|
payWorking.setPaidAmount(newPaidAmount);
|
||||||
payWorking.setInAccount(inAccount);
|
payWorking.setInAccount(inAccount);
|
||||||
paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
|
paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
|
||||||
|
//发消息
|
||||||
|
payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
|
||||||
}else{
|
}else{
|
||||||
paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), payWorking.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
|
paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), payWorking.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
|
||||||
//发消息参数
|
//发消息
|
||||||
principalId = payWorkingGroup.getPrincipalIdA();
|
checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
|
||||||
project = payWorkingGroup.getWorkingGroupProject();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
payWorking.setPaymentStatus(paymentStatus);
|
payWorking.setPaymentStatus(paymentStatus);
|
||||||
@@ -509,6 +515,9 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
throw new JeroBootException("只有待审核的才可以审核");
|
throw new JeroBootException("只有待审核的才可以审核");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//发消息参数
|
||||||
|
principalId = payMemberProject.getDirectorId();
|
||||||
|
project = payMemberProject.getProjectName();
|
||||||
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
||||||
//已同意
|
//已同意
|
||||||
newPaidAmount =payPaymentRecordService.addPaidAmount(member.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
|
newPaidAmount =payPaymentRecordService.addPaidAmount(member.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
|
||||||
@@ -516,11 +525,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
member.setPaidAmount(newPaidAmount);
|
member.setPaidAmount(newPaidAmount);
|
||||||
member.setInAccount(inAccount);
|
member.setInAccount(inAccount);
|
||||||
paymentStatus = getPaymentStatus(member.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
|
paymentStatus = getPaymentStatus(member.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
|
||||||
|
// 发消息
|
||||||
|
payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
|
||||||
}else{
|
}else{
|
||||||
paymentStatus = getPaymentStatus(member.getAmountReceivable(), member.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
|
paymentStatus = getPaymentStatus(member.getAmountReceivable(), member.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
|
||||||
//发消息参数
|
|
||||||
principalId = payMemberProject.getDirectorId();
|
|
||||||
project = payMemberProject.getProjectName();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
member.setPaymentStatus(paymentStatus);
|
member.setPaymentStatus(paymentStatus);
|
||||||
@@ -537,6 +545,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
throw new JeroBootException("只有待审核的才可以审核");
|
throw new JeroBootException("只有待审核的才可以审核");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//发消息参数
|
||||||
|
principalId = tbMemberProject.getDirectorId();
|
||||||
|
project = tbMemberProject.getProjectName();
|
||||||
|
|
||||||
TbCheckVo tbCheckVo = new TbCheckVo();
|
TbCheckVo tbCheckVo = new TbCheckVo();
|
||||||
|
|
||||||
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
||||||
@@ -552,11 +564,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
payPaymentRecordMapper.insert(payPaymentRecord);
|
payPaymentRecordMapper.insert(payPaymentRecord);
|
||||||
|
|
||||||
tbCheckVo.setCheckResult(PayProjectCommon.YES);
|
tbCheckVo.setCheckResult(PayProjectCommon.YES);
|
||||||
|
//发消息
|
||||||
|
payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
|
||||||
}else{
|
}else{
|
||||||
paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), tbMember.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
|
paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), tbMember.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
|
||||||
//发消息参数
|
|
||||||
principalId = tbMemberProject.getDirectorId();
|
|
||||||
project = tbMemberProject.getProjectName();
|
|
||||||
|
|
||||||
tbCheckVo.setCheckResult(PayProjectCommon.NO);
|
tbCheckVo.setCheckResult(PayProjectCommon.NO);
|
||||||
}
|
}
|
||||||
@@ -581,6 +592,9 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(tbMemberCertificate.getPaymentStatus())){
|
if(!PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(tbMemberCertificate.getPaymentStatus())){
|
||||||
throw new JeroBootException("只有待审核的才可以审核");
|
throw new JeroBootException("只有待审核的才可以审核");
|
||||||
}
|
}
|
||||||
|
//发消息参数
|
||||||
|
principalId = tbMemberProjectCertificate.getDirectorId();
|
||||||
|
project = tbMemberProjectCertificate.getProjectName();
|
||||||
|
|
||||||
TbCheckVo tbCheckCerVo = new TbCheckVo();
|
TbCheckVo tbCheckCerVo = new TbCheckVo();
|
||||||
|
|
||||||
@@ -604,12 +618,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
PayContactsManagementTemporary meetingTemporaryCer = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
|
PayContactsManagementTemporary meetingTemporaryCer = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
|
||||||
listId.add(meetingTemporaryCer);
|
listId.add(meetingTemporaryCer);
|
||||||
}
|
}
|
||||||
|
//发消息
|
||||||
|
payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
|
||||||
}else{
|
}else{
|
||||||
paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), tbMemberCertificate.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
|
paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), tbMemberCertificate.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
|
||||||
//发消息参数
|
|
||||||
principalId = tbMemberProjectCertificate.getDirectorId();
|
|
||||||
project = tbMemberProjectCertificate.getProjectName();
|
|
||||||
|
|
||||||
tbCheckCerVo.setCheckResult(PayProjectCommon.NO);
|
tbCheckCerVo.setCheckResult(PayProjectCommon.NO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -655,10 +667,6 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//通过消息
|
|
||||||
// payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
|
|
||||||
// //拒绝消息
|
|
||||||
// checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user