Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test

performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java

@@ -154,10 +154,10 @@ public class OrderChildLoanComponent {
             BigDecimal loanResidueBalance = ownerLoanRecord.getLoanResidueBalance();
             log.info("12.当前预估运费金额：{},借款单号{},借款剩余金额{}", orderChildPriceTemp, ownerLoanRecord.getLoanNo(), loanResidueBalance);
             if (loanResidueBalance.compareTo(orderChildPriceTemp) >= 0) {
-                orderChildPriceTemp = BigDecimal.ZERO;
                 log.info("当前借款单的剩余金额足够预估运费金额");
                 generateFrozenOwnerLoanRunningWater(ownerLoanRecord, childNo, orderChildPrice);
                 updateList.add(ownerLoanRecord.setLoanResidueBalance(loanResidueBalance.subtract(orderChildPriceTemp)));
+                orderChildPriceTemp = BigDecimal.ZERO;
                 break;
             } else {
                 log.info("当前借款单的剩余金额不够抵扣预估运费金额,先进行扣除当前借款所有剩余");
@@ -204,7 +204,8 @@ public class OrderChildLoanComponent {
                 waterRecord.setAlterationBalance(orderChildPrice);
                 waterRecord.setFrozenBalance(account.getFundingFrozenBalance().add(account.getVirtuallyFrozenBalance()));
                 waterRecord.setCreateBy("系统");
-                log.info("14.生成借款账户流水信息:{}", JSONUtil.parse(waterRecord));
+
+
                 ownerLoanAccountRunningWaterRecordDao.saveEntity(waterRecord);
                 break;
             }

performance-web/src/main/java/com/clx/performance/mapper/loan/OwnerLoanAccountMapper.java

@@ -26,9 +26,9 @@ public interface OwnerLoanAccountMapper extends BaseMapper<OwnerLoanAccount> {
     Integer addAccount(@Param("account") OwnerLoanAccount account, @Param("now") String nowStr);
 
     @Update("update owner_loan_account set funding_account_balance = funding_account_balance - #{account.fundingAccountBalance}" +
-            ",funding_usable_balance = funding_usable_balance - #{account.fundingUsableBalance},funding_frozen_balance = funding_frozen_balance - #{account.fundingFrozenBalance}" +
+            ",funding_usable_balance = funding_usable_balance + #{account.fundingUsableBalance},funding_frozen_balance = funding_frozen_balance - #{account.fundingFrozenBalance}" +
             ",virtually_account_balance = virtually_account_balance - #{account.virtuallyAccountBalance},virtually_usable_balance = virtually_usable_balance - #{account.virtuallyUsableBalance}" +
-            ",virtually_frozen_balance = virtually_frozen_balance - #{account.virtuallyFrozenBalance}" +
+            ",virtually_frozen_balance = virtually_frozen_balance + #{account.virtuallyFrozenBalance}" +
             ",modified_time=#{now}"
             + "where id = #{account.id} and modified_time = #{account.modifiedTime}"
     )