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

fix 87645 87647 修改确收金额后缴费凭证状态有问题

Browse Source
This commit is contained in:
lijiarao
2024-07-30 09:37:51 +08:00
parent c431fb0853
commit c86eb4d4f6
5 changed files with 68 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java
+2 -1
View File
@@ -51,7 +51,8 @@ public interface IPayPaymentCheckService extends IService<PayPaymentRecordSub> {
* @param amountReceivable 应收
* @param paidAmount 实收
* @param paymentStatus 缴费状态
* @param changeReceivableAmountFlag
* @return
*/
String getPaymentStatus(BigDecimal amountReceivable,BigDecimal paidAmount,String paymentStatus);
String getPaymentStatus(BigDecimal amountReceivable, BigDecimal paidAmount, String paymentStatus, boolean changeReceivableAmountFlag);
}
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
+34 -19
View File
@@ -16,7 +16,6 @@ import com.jero.common.exception.JeroBootException;
import com.jero.common.service.SendMessageService;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.AuthenticationUtils;
import com.jero.common.util.PasswordUtil;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayContactsManagementService;
@@ -531,7 +530,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
payPaymentRecords.add(payPaymentRecord);
payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG2,"check");
}else{
paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), payCommonProject.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
paymentStatus = getPaymentStatus(payCommonProject.getReceivableAmount(), payCommonProject.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode(), false);//缴费状态
payCommonProject.setPaymentStatus(paymentStatus);
//更新主列表
payCommonProjectMapper.updateById(payCommonProject);
@@ -555,7 +554,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
payPaymentRecords.add(payPaymentRecord);
payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG2,"check");
}else{
paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), payWorking.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
paymentStatus = getPaymentStatus(payWorking.getReceivableAmount(), payWorking.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode(), false);//缴费状态
payWorking.setPaymentStatus(paymentStatus);
//更新主列表
payWorkingGroupSubItemMapper.updateById(payWorking);
@@ -582,7 +581,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
payPaymentRecords.add(payPaymentRecord);
payPaymentRecordService.addAmountReceived(payPaymentRecords,ProjectCommon.PAYMENT_FLAG2,"check");
}else{
paymentStatus = getPaymentStatus(member.getAmountReceivable(), member.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
paymentStatus = getPaymentStatus(member.getAmountReceivable(), member.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode(), false);//缴费状态
member.setPaymentStatus(paymentStatus);
//更新主列表
payMemberProjectSubitemMapper.updateById(member);
@@ -621,7 +620,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
}
payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
}else{
paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), tbMember.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
paymentStatus = getPaymentStatus(tbMember.getAmountReceivable(), tbMember.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode(), false);//缴费状态
tbMember.setPaymentStatus(paymentStatus);
tbCheckVo.setCheckResult(PayProjectCommon.NO);
@@ -670,7 +669,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
inAccount = payPaymentRecordService.getInAccount(tbMemberCertificate.getAmountReceivable(), newPaidAmount);//到账状态
tbMemberCertificate.setPaidAmount(newPaidAmount);
tbMemberCertificate.setInAccount(inAccount);
paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode(), false);//缴费状态
tbMemberCertificate.setPaymentStatus(paymentStatus);
//插入来款记录表
payPaymentRecord.setId(null);
@@ -694,7 +693,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
}
payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
}else{
paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), tbMemberCertificate.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), tbMemberCertificate.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode(), false);//缴费状态
tbMemberCertificate.setPaymentStatus(paymentStatus);
tbCheckCerVo.setCheckResult(PayProjectCommon.NO);
@@ -743,28 +742,44 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
* @param amountReceivable 应收
* @param paidAmount 实收
* @param paymentStatus 缴费状态
* @param changeReceivableAmountFlag 更改待确收金额标识
* @return
*/
@Override
public String getPaymentStatus(BigDecimal amountReceivable,BigDecimal paidAmount,String paymentStatus){
public String getPaymentStatus(BigDecimal amountReceivable, BigDecimal paidAmount, String paymentStatus, boolean changeReceivableAmountFlag){
if(amountReceivable == null){
amountReceivable = new BigDecimal("0.00");
}
if(paidAmount == null){
paidAmount = new BigDecimal("0.00");
}
if (changeReceivableAmountFlag){
// 实收金额 < 待确收金额 && 不等于待审核/已拒绝
if(paidAmount.compareTo(amountReceivable) < 0
&& !PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)
&& !PaymentStatusEnum.REJECTED.getCode().equals(paymentStatus)){
paymentStatus = PaymentStatusEnum.TO_BE_UPLOADED.getCode();//待上传
}
// 应收>0 && 实收金额 == 待确收金额 && 不等于待审核
if(amountReceivable.compareTo(new BigDecimal("0.00")) > 0
&& paidAmount.compareTo(amountReceivable) == 0
&& !PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)){
paymentStatus = PaymentStatusEnum.COMPLETED.getCode();//已完结
}
}else {
// 实收金额 < 待确收金额 && 不等于待审核/已拒绝
if(paidAmount.compareTo(amountReceivable) < 0
&& !PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)
&& !PaymentStatusEnum.REJECTED.getCode().equals(paymentStatus)){
paymentStatus = PaymentStatusEnum.TO_BE_UPLOADED.getCode();//待上传
}
// 应收>0 && 实收金额 == 待确收金额
if(amountReceivable.compareTo(new BigDecimal("0.00")) > 0
&& paidAmount.compareTo(amountReceivable) == 0){
paymentStatus = PaymentStatusEnum.COMPLETED.getCode();//已完结
}
}
// 实收金额 < 待确收金额 && 不等于待审核/已拒绝
if(paidAmount.compareTo(amountReceivable) < 0
&& !PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)
&& !PaymentStatusEnum.REJECTED.getCode().equals(paymentStatus)){
paymentStatus = PaymentStatusEnum.TO_BE_UPLOADED.getCode();//待上传
}
// 应收>0 && 实收金额 == 待确收金额
if(amountReceivable.compareTo(new BigDecimal("0.00")) > 0
&& paidAmount.compareTo(amountReceivable) == 0){
paymentStatus = PaymentStatusEnum.COMPLETED.getCode();//已完结
}
return paymentStatus;
}
}
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+28 -17
View File
@@ -411,7 +411,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
newPaidAmount =addPaidAmount(payCommonProject.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = getInAccount(payCommonProject.getReceivableAmount(), newPaidAmount);//到账状态
paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = payCommonProject.getPaymentStatus();
paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, paymentStatus, false);//缴费状态
tax = addPaidAmount(payCommonProject.getPaidTax(),payPaymentRecord.getTax());
noTaxAmount = addPaidAmount(payCommonProject.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
payCommonProject.setPaidTax(tax);
@@ -442,7 +443,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
newPaidAmount =addPaidAmount(payWorking.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = getInAccount(payWorking.getReceivableAmount(), newPaidAmount);//到账状态
paymentStatus = payPaymentCheckService.getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = payWorking.getPaymentStatus();
paymentStatus = payPaymentCheckService.getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, paymentStatus, false);//缴费状态
tax = addPaidAmount(payWorking.getPaidTax(),payPaymentRecord.getTax());
noTaxAmount = addPaidAmount(payWorking.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
payWorking.setPaidTax(tax);
@@ -471,7 +473,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
newPaidAmount =addPaidAmount(meeting.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = getInAccount(meeting.getAmountReceivable(), newPaidAmount);//到账状态
paymentStatus = payPaymentCheckService.getPaymentStatus(meeting.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = meeting.getPaymentStatus();
paymentStatus = payPaymentCheckService.getPaymentStatus(meeting.getAmountReceivable(), newPaidAmount, paymentStatus, false);//缴费状态
tax = addPaidAmount(meeting.getPaidTax(),payPaymentRecord.getTax());
noTaxAmount = addPaidAmount(meeting.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
meeting.setPaidTax(tax);
@@ -498,7 +501,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
newPaidAmount =addPaidAmount(member.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = getInAccount(member.getAmountReceivable(), newPaidAmount);//到账状态
paymentStatus = payPaymentCheckService.getPaymentStatus(member.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = member.getPaymentStatus();
paymentStatus = payPaymentCheckService.getPaymentStatus(member.getAmountReceivable(), newPaidAmount, paymentStatus, false);//缴费状态
tax = addPaidAmount(member.getPaidTax(),payPaymentRecord.getTax());
noTaxAmount = addPaidAmount(member.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
member.setPaidTax(tax);
@@ -528,7 +532,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
newPaidAmount =addPaidAmount(tbMember.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = getInAccount(tbMember.getAmountReceivable(), newPaidAmount);//到账状态
paymentStatus = payPaymentCheckService.getPaymentStatus(tbMember.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = tbMember.getPaymentStatus();
paymentStatus = payPaymentCheckService.getPaymentStatus(tbMember.getAmountReceivable(), newPaidAmount, paymentStatus, false);//缴费状态
tax = addPaidAmount(tbMember.getPaidTax(),payPaymentRecord.getTax());
noTaxAmount = addPaidAmount(tbMember.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
tbMember.setPaidTax(tax);
@@ -560,7 +565,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
newPaidAmount =addPaidAmount(tbMemberCertificate.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = getInAccount(tbMemberCertificate.getAmountReceivable(), newPaidAmount);//到账状态
paymentStatus = payPaymentCheckService.getPaymentStatus(tbMemberCertificate.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = tbMemberCertificate.getPaymentStatus();
paymentStatus = payPaymentCheckService.getPaymentStatus(tbMemberCertificate.getAmountReceivable(), newPaidAmount, paymentStatus, false);//缴费状态
tax = addPaidAmount(tbMemberCertificate.getPaidTax(),payPaymentRecord.getTax());
noTaxAmount = addPaidAmount(tbMemberCertificate.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
tbMemberCertificate.setPaidTax(tax);
@@ -1258,7 +1264,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
String projectId = param.getProjectId();
Integer projectType = param.getProjectType();
BigDecimal receivableAmount = param.getReceivableAmount();
boolean changeReceivableAmountFlag = true;
//到账金额
BigDecimal paidAmount;
//缴费凭证状态
@@ -1301,7 +1307,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
payCommonProject.setTax(receivableAmount.subtract(noTaxAmount));
//到账状态
inAccount = getInAccount(receivableAmount, paidAmount);
paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = payCommonProject.getPaymentStatus();
paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, paymentStatus, changeReceivableAmountFlag);//缴费状态
payCommonProject.setPaymentStatus(paymentStatus);
payCommonProject.setInAccount(inAccount);
//确认收入状态
@@ -1332,7 +1339,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
payWorking.setTax(receivableAmount.subtract(noTaxAmount));
//到账状态
inAccount = getInAccount(receivableAmount, paidAmount);
paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = payWorking.getPaymentStatus();
paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, paymentStatus, changeReceivableAmountFlag);//缴费状态
payWorking.setPaymentStatus(paymentStatus);
payWorking.setInAccount(inAccount);
//确认收入状态
@@ -1363,7 +1371,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
meetingSituation.setTax(receivableAmount.subtract(noTaxAmount));
//到账状态
inAccount = getInAccount(receivableAmount, paidAmount);
paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = meetingSituation.getPaymentStatus();
paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, paymentStatus, changeReceivableAmountFlag);//缴费状态
meetingSituation.setPaymentStatus(paymentStatus);
meetingSituation.setInAccount(inAccount);
//确认收入状态
@@ -1394,7 +1403,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
member.setTax(receivableAmount.subtract(noTaxAmount));
//到账状态
inAccount = getInAccount(receivableAmount, paidAmount);
paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = member.getPaymentStatus();
paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, paymentStatus, changeReceivableAmountFlag);//缴费状态
member.setPaymentStatus(paymentStatus);
member.setInAccount(inAccount);
//确认收入状态
@@ -1425,7 +1435,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
projectSubitem.setTax(receivableAmount.subtract(noTaxAmount));
//到账状态
inAccount = getInAccount(receivableAmount, paidAmount);
paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = projectSubitem.getPaymentStatus();
paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount, paidAmount, paymentStatus, changeReceivableAmountFlag);//缴费状态
projectSubitem.setPaymentStatus(paymentStatus);
projectSubitem.setInAccount(inAccount);
//确认收入状态
@@ -1582,7 +1593,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
newPaidAmount =subtract(payCommonProject.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = getInAccount(payCommonProject.getReceivableAmount(), newPaidAmount);//到账状态
paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode(), false);//缴费状态
tax = subtract(payCommonProject.getPaidTax(),payPaymentRecord.getTax());
noTaxAmount = subtract(payCommonProject.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
payCommonProject.setPaidTax(tax);
@@ -1602,7 +1613,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
newPaidAmount =subtract(payWorking.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = getInAccount(payWorking.getReceivableAmount(), newPaidAmount);//到账状态
paymentStatus = payPaymentCheckService.getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = payPaymentCheckService.getPaymentStatus(payWorking.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode(), false);//缴费状态
tax = subtract(payWorking.getPaidTax(),payPaymentRecord.getTax());
noTaxAmount = subtract(payWorking.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
payWorking.setPaidTax(tax);
@@ -1621,7 +1632,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
newPaidAmount =subtract(meeting.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = getInAccount(meeting.getAmountReceivable(), newPaidAmount);//到账状态
paymentStatus = payPaymentCheckService.getPaymentStatus(meeting.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = payPaymentCheckService.getPaymentStatus(meeting.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode(), false);//缴费状态
tax = subtract(meeting.getPaidTax(),payPaymentRecord.getTax());
noTaxAmount = subtract(meeting.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
meeting.setPaidTax(tax);
@@ -1641,7 +1652,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
newPaidAmount =subtract(member.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = getInAccount(member.getAmountReceivable(), newPaidAmount);//到账状态
paymentStatus = payPaymentCheckService.getPaymentStatus(member.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = payPaymentCheckService.getPaymentStatus(member.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode(), false);//缴费状态
tax = subtract(member.getPaidTax(),payPaymentRecord.getTax());
noTaxAmount = subtract(member.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
member.setPaidTax(tax);
@@ -1660,7 +1671,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
newPaidAmount =subtract(projectSubitem.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
inAccount = getInAccount(projectSubitem.getAmountReceivable(), newPaidAmount);//到账状态
paymentStatus = payPaymentCheckService.getPaymentStatus(projectSubitem.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
paymentStatus = payPaymentCheckService.getPaymentStatus(projectSubitem.getAmountReceivable(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode(), false);//缴费状态
tax = subtract(projectSubitem.getPaidTax(),payPaymentRecord.getTax());
noTaxAmount = subtract(projectSubitem.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
projectSubitem.setPaidTax(tax);
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+1 -1
View File
@@ -256,7 +256,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
payCommonProject.setMail(projectStatusVO.getMail());
}
}
String paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(),payCommonProject.getPaidAmount(),payCommonProject.getPaymentStatus());
String paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(),payCommonProject.getPaidAmount(),payCommonProject.getPaymentStatus(), false);
payCommonProject.setPaymentStatus(paymentStatus);
payCommonProjectService.updateById(payCommonProject);
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+3 -3
View File
@@ -444,7 +444,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
payWorkingGroupSubItem.setMail(projectStatusVO.getMail());
}
}
String paymentStatus = payPaymentCheckService.getPaymentStatus(payWorkingGroupSubItem.getReceivableAmount(), payWorkingGroupSubItemOld.getPaidAmount(), payWorkingGroupSubItemOld.getPaymentStatus());
String paymentStatus = payPaymentCheckService.getPaymentStatus(payWorkingGroupSubItem.getReceivableAmount(), payWorkingGroupSubItemOld.getPaidAmount(), payWorkingGroupSubItemOld.getPaymentStatus(), false);
payWorkingGroupSubItem.setPaymentStatus(paymentStatus);
payWorkingGroupSubItem.setInAccount(null);
payWorkingGroupSubItem.setPaidAmount(null);
@@ -621,7 +621,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
payWorkingGroupSubItem.setMail(projectStatusVO.getMail());
}
}
String paymentStatus = payPaymentCheckService.getPaymentStatus(payWorkingGroupSubItem.getReceivableAmount(), payWorkingGroupSubItemOld.getPaidAmount(), payWorkingGroupSubItemOld.getPaymentStatus());
String paymentStatus = payPaymentCheckService.getPaymentStatus(payWorkingGroupSubItem.getReceivableAmount(), payWorkingGroupSubItemOld.getPaidAmount(), payWorkingGroupSubItemOld.getPaymentStatus(), false);
payWorkingGroupSubItem.setPaymentStatus(paymentStatus);
payWorkingGroupSubItem.setInAccount(null);
payWorkingGroupSubItem.setPaidAmount(null);
@@ -1172,7 +1172,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getMail, projectStatusVO.getMail());
}
}
String paymentStatus = payPaymentCheckService.getPaymentStatus(input.getReceivableAmount(), p.getPaidAmount(), p.getPaymentStatus());
String paymentStatus = payPaymentCheckService.getPaymentStatus(input.getReceivableAmount(), p.getPaidAmount(), p.getPaymentStatus(), false);
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPaymentStatus, paymentStatus);
updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId, p.getId());
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeWay, PayProjectCommon.CHARGE_WAY3);