货主还款、取消支付、重新支付

performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanRecordServiceImpl.java

@@ -291,8 +291,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
      * @param ownerLoanRecord
      */
     private void initOwnerLoanRunningWaterRecord(OwnerLoanRecord ownerLoanRecord) {
-        OwnerLoanAccount ownerLoanAccount;
-        ownerLoanAccount = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo, ownerLoanRecord.getOwnerUserNo()).get();
+        OwnerLoanAccount ownerLoanAccount= ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo, ownerLoanRecord.getOwnerUserNo()).get();
         ownerLoanRecordDao.updateEntityByKey(ownerLoanRecord);
         OwnerLoanAccountRunningWaterRecord record = new OwnerLoanAccountRunningWaterRecord()
                 .setOwnerUserNo(ownerLoanRecord.getOwnerUserNo())
@@ -302,6 +301,8 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
                 .setLoanNo(ownerLoanRecord.getLoanNo())
                 .setRunningWaterType(RunningWaterTypeEnum.Status.LOAN.getCode())
                 .setAlterationBalance(ownerLoanRecord.getLoanBalance())
+                .setUseAbleBalance(ownerLoanAccount.getFundingUsableBalance().add(ownerLoanAccount.getVirtuallyUsableBalance()))
+                .setFrozenBalance(ownerLoanAccount.getFundingFrozenBalance().add(ownerLoanAccount.getVirtuallyFrozenBalance()))
                 .setAccountBalance(ownerLoanAccount.getFundingAccountBalance().add(ownerLoanAccount.getVirtuallyAccountBalance()))
                 .setCreateBy("系统");
         ownerLoanAccountRunningWaterRecordDao.saveEntity(record);

performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankServiceImpl.java

@@ -247,7 +247,10 @@ public class NbBankServiceImpl implements NbBankService {
                 rabbitTemplate.send(
                         RabbitKeyConstants.OWNER_LOAN_EXCHANGE, RabbitKeyConstants.OWNER_LOAN_PAY_ROUTE_KEY, message
                 );
-            }
+            } else if ("还款单".equals(bankTrade.getRemark())) {
+                rabbitTemplate.send(
+                        RabbitKeyConstants.OWNER_LOAN_EXCHANGE, RabbitKeyConstants.OWNER_REPAYMENT_ROUTE_KEY, message
+                );            }
 
 
         }