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

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

@@ -147,8 +147,8 @@ public class OwnerLoanAccountServiceImpl implements OwnerLoanAccountService {
         bankTrade.setRelationNo(ownerRepayment.getRepaymentNo().toString());
         bankTrade.setOrderType(BankTradeEnum.OrderType.OWNER_LOAN_RECORD.getCode());
         bankTrade.setAmount(ownerLoanRecord.getLoanBalance());
-        bankTrade.setMerchantRunningWaterNo(ownerLoanRecord.getMerchantRunningWaterNo());
-        bankTrade.setRunningWaterOpenNo(ownerLoanRecord.getRunningWaterOpenNo());
+        bankTrade.setMerchantRunningWaterNo(ownerRepayment.getMerchantRunningWaterNo());
+        bankTrade.setRunningWaterOpenNo(ownerRepayment.getRunningWaterOpenNo());
         bankTrade.setRemark("还款单");
         // 保存银行交易记录
         bankTradeDao.saveEntity(bankTrade);

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

@@ -225,6 +225,9 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
                         initOwnerLoanRunningWaterRecord(ownerLoanRecord);
                         //生成还款记录
                         initOwnerRepayment(ownerLoanRecord);
+
+                        //执行货主未处理借款标志的计费(运单确认生成后因为借款不够阻塞流程的相关计费进行处理)
+                        orderChildLoanProcess(ownerLoanRecord.getOwnerUserNo());
                         break;
                     }
                 }
@@ -326,7 +329,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         ownerRepayment.setCreateBy(ownerLoanRecord.getOwnerUserName());
         ownerRepayment.setRepaymentBalance(ownerLoanRecord.getLoanBalance());
         ownerRepayment.setRepaymentNo(idGenerateSnowFlake.nextId(2L));
-
+        ownerRepayment.setGoodsName("运费");
 
         ownerRepayment.setPayee(ownerLoanRecord.getPayee());
         ownerRepayment.setPayeeAccount(ownerLoanRecord.getPayeeAccount());

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

@@ -76,14 +76,14 @@ public class NbBankServiceImpl implements NbBankService {
 
     /**
      * 订单支付
-     * @param loanNo 借款单号
+     * @param no 单号
      * @param amount 金额分
      * @param payAcctOpenBankId 开户行号
      * @param payAcctNo 付款账号
      * @param payAcctNm 付款户名
      */
     @Override
-    public NbBankOrderPayResultVO orderDirectPay(Long loanNo, String remark, Integer amount,
+    public NbBankOrderPayResultVO orderDirectPay(Long no, String remark, Integer amount,
                                                  String payAcctOpenBankId, String payAcctNo, String payAcctNm) {
         String merSeqNo = idGenerateSnowFlake.nextIdToString(1L);
 
@@ -94,7 +94,7 @@ public class NbBankServiceImpl implements NbBankService {
 
         String transSeqNo = data.getString("transSeqNo");
         if (StringUtils.isBlank(transSeqNo)) {
-            log.info("宁波银行订单支付失败,单号{},返回结果:{}", loanNo, data);
+            log.info("宁波银行订单支付失败,单号{},返回结果:{}", no, data);
             throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_ORDER_PAY_ERROR);
         }
         NbBankOrderPayResultVO result = new NbBankOrderPayResultVO();