aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop

Browse Source
This commit is contained in:
aike 2025-09-04 17:55:21 +08:00
commit 44a4e4dee7
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
View File

@ -863,14 +863,13 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
log.debug("reCalcSettleBillPayStatus===>应收:{}",oldBill.getRecMoney());
for(EmisSettlePayRecord item:payRecordList){
if("1".equals(item.getRecType())) {
totalHasPayMoney = totalHasPayMoney.add(item.getPayMoney());
satisfyMoney = satisfyMoney.add(item.getSatisfyMoney() == null ? BigDecimal.ZERO : item.getSatisfyMoney());
allowanceMoney = allowanceMoney.add(item.getAllowanceMoney() == null ? BigDecimal.ZERO : item.getAllowanceMoney());
deductionMoney = deductionMoney.add(item.getDeductionMoney() == null ? BigDecimal.ZERO : item.getDeductionMoney());
otherMoney = otherMoney.add(item.getOtherMoney() == null ? BigDecimal.ZERO : item.getOtherMoney());
}
else if("2".equals(item.getRecType())) {
totalHasPayMoney = totalHasPayMoney.add(item.getPayMoney());
satisfyMoney = satisfyMoney.add(item.getSatisfyMoney() == null ? BigDecimal.ZERO : item.getSatisfyMoney());
allowanceMoney = allowanceMoney.add(item.getAllowanceMoney() == null ? BigDecimal.ZERO : item.getAllowanceMoney());
deductionMoney = deductionMoney.add(item.getDeductionMoney() == null ? BigDecimal.ZERO : item.getDeductionMoney());
otherMoney = otherMoney.add(item.getOtherMoney() == null ? BigDecimal.ZERO : item.getOtherMoney());
if("2".equals(item.getRecType())) {
refundMoney = refundMoney.add(item.getRefundMoney() == null ? BigDecimal.ZERO : item.getRefundMoney());
}
}
@ -939,13 +938,12 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
// 全部收款金额
BigDecimal totalAllPayMoney = BigDecimal.ZERO;
// 收款金额-退款金额
// 收款金额
totalAllPayMoney=totalMoney
.add(satisfyMoney)
.add(allowanceMoney)
.add(deductionMoney)
.add(otherMoney)
.subtract(refundMoney);
.add(otherMoney);
EmisSettleBill newBill = new EmisSettleBill();
newBill.setId(oldBill.getId());
@ -988,8 +986,9 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
.add(satisfyMoney)
.add(allowanceMoney)
.add(deductionMoney)
.add(otherMoney)
.subtract(refundMoney);
.add(otherMoney);
// .subtract(refundMoney);
EmisSettleBill newBill = new EmisSettleBill();
newBill.setId(oldBill.getId());
@ -1065,13 +1064,14 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
// 全部收款金额
BigDecimal totalAllPayMoney = BigDecimal.ZERO;
BigDecimal totalMoney = BigDecimal.ZERO;
// 收款金额-退款金额
// 收款金额
totalAllPayMoney=totalMoney
.add(satisfyMoney)
.add(allowanceMoney)
.add(deductionMoney)
.add(otherMoney)
.subtract(refundMoney);
.add(otherMoney);
// .subtract(refundMoney);
EmisSettleBill newBill = new EmisSettleBill();
newBill.setId(oldBill.getId());