|
|
@@ -304,12 +304,12 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
//计算剩余需要支付金额
|
|
|
BigDecimal decbitAmount=debit.getTotalAmount().subtract(debit.getSettlementAmount());
|
|
|
//本次金额大于等于需要抵扣金额,则变成完全抵扣,抵扣金额变成本次已付金额
|
|
|
- if (in.getTotalAmount().compareTo(decbitAmount)>0){
|
|
|
+ if (in.getTotalAmount().compareTo(decbitAmount)>=0){
|
|
|
in.setSettlementAmount(decbitAmount);
|
|
|
newDebit.setSettlementAmount(debit.getTotalAmount());
|
|
|
newDebit.setLiquidationStatus(2);
|
|
|
}else {
|
|
|
-// 本次金额小于需要抵扣,则本次变更全抵扣,借支已付加上本次金额
|
|
|
+// 本次金额小于需要抵扣,则本次变更全抵扣,借支已付加上本次金额
|
|
|
in.setSettlementAmount(in.getTotalAmount());
|
|
|
newDebit.setSettlementAmount(debit.getSettlementAmount().add(in.getTotalAmount()));
|
|
|
newDebit.setLiquidationStatus(1);
|