Commit 4d008b3e authored by 耿迪迪's avatar 耿迪迪

操作记录修改

parent 21bf1281
...@@ -89,6 +89,8 @@ public class SettlementDebit { ...@@ -89,6 +89,8 @@ public class SettlementDebit {
*/ */
private void debitDeptSettlement(Long deptId, BigDecimal amount,String operatorType){ private void debitDeptSettlement(Long deptId, BigDecimal amount,String operatorType){
TAccount account = getAccountInfo(deptId); TAccount account = getAccountInfo(deptId);
//更新可用额度
updateAccount(account,amount,operatorType);
//结算本部尾款 //结算本部尾款
if("0".equals(account.getTransferSwitch())){ if("0".equals(account.getTransferSwitch())){
List<TTradeProject> pendingPaymentInfo = tTradeProjectMapper.getTradePendingPaymentInfo(deptId); List<TTradeProject> pendingPaymentInfo = tTradeProjectMapper.getTradePendingPaymentInfo(deptId);
...@@ -101,8 +103,6 @@ public class SettlementDebit { ...@@ -101,8 +103,6 @@ public class SettlementDebit {
amount = amount.subtract(changeAmount); amount = amount.subtract(changeAmount);
} }
} }
//更新可用额度
updateAccount(account,amount,operatorType);
} }
......
...@@ -87,6 +87,8 @@ public class SettlementTrade { ...@@ -87,6 +87,8 @@ public class SettlementTrade {
TAccount account = getAccountInfo(this.tradeProject.getApplyDeptId()); TAccount account = getAccountInfo(this.tradeProject.getApplyDeptId());
//进账 //进账
BigDecimal incomeAmount = this.tradeProject.getDealPrice().subtract(this.tradeProject.getPendingPayment()); BigDecimal incomeAmount = this.tradeProject.getDealPrice().subtract(this.tradeProject.getPendingPayment());
//更新可用额度
updateAccount(account,incomeAmount);
//判断是否有进账 //判断是否有进账
if(incomeAmount.compareTo(BigDecimal.ZERO) == 1 && "0".equals(account.getTransferSwitch())){ if(incomeAmount.compareTo(BigDecimal.ZERO) == 1 && "0".equals(account.getTransferSwitch())){
//结算本部尾款 //结算本部尾款
...@@ -100,8 +102,6 @@ public class SettlementTrade { ...@@ -100,8 +102,6 @@ public class SettlementTrade {
incomeAmount = incomeAmount.subtract(amount); incomeAmount = incomeAmount.subtract(amount);
} }
} }
//更新可用额度
updateAccount(account,incomeAmount);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment