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

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

@@ -94,7 +94,7 @@ public class OrderChildLoanComponent {
         OwnerQuotationDetailVO quotationDetailVO = orderFeign.getQuotationByOrderNo(orderInfoVO.getOrderNo()).getData();
         BigDecimal freightFreezeRate = quotationDetailVO.getFreightFreezeRate();
 
-        if (freightFreezeRate.compareTo(BigDecimal.ONE) == 0) {
+        if (freightFreezeRate.compareTo(new BigDecimal(100)) == 0) {
             //百分百预付不需要考虑借款账户
             log.info("2.百分百预付不需要考虑借款账户");
             return;

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

@@ -189,7 +189,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
             //设置借款记录中借款方和借出方的银行账户信息
             OwnerInfoFeignVO ownerInfoFeignVO = ownerInfoService.getOwnerInfo(ownerLoanRecord.getOwnerUserNo());
             String ownerAccountBank = ownerInfoFeignVO.getOwnerAccountBank();
-            ownerLoanRecord.setLendingParty(ownerInfoFeignVO.getName());
+            ownerLoanRecord.setLendingParty(ownerInfoFeignVO.getCompanyName());
             ownerLoanRecord.setLendingPartyBank(ownerAccountBank);
             ownerLoanRecord.setLendingPartyAccount(ownerInfoFeignVO.getOwnerBankAccount());
             ownerLoanRecord.setLendingPartyOpenBank(ownerInfoFeignVO.getOwnerOpenBank());