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

performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/PageOwnerLoanAccountWaterRecordOfOwnerParam.java

@@ -16,7 +16,7 @@ public class PageOwnerLoanAccountWaterRecordOfOwnerParam extends PageParam {
     @ApiModelProperty(value = "货主编码", example = "10000000")
     private Long ownerUserNo;
     @ApiModelProperty(value = "流水号", example = "100000")
-    private Long runningWaterNo;
+    private String runningWaterNo;
     @ApiModelProperty(value = "运单编号", example = "10000")
     private String childNo;
     @ApiModelProperty(value = "流水类型 80：借款 90:冻结 100：运单抵扣 110:解冻", example = "10")

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

@@ -166,9 +166,13 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
 
         entity.setLendingParty(param.getLendingParty());
         entity.setLendingPartyAccount(ownerBindCardRecord.getBankCardNumber());
+        ClxPayeeConfig.PayeeConfig payeeMap = ClxPayeeConfig.getPayee(ClxPayeeConfig.XXH_ID);
+        entity.setPayee(payeeMap.getName());
+        entity.setPayeeAccount(payeeMap.getAccount());
+        entity.setPayeeBank(payeeMap.getBank());
+        entity.setPayeeBankCode(payeeMap.getBankNo());
+
 
-        entity.setPayee(param.getPayee());
-        entity.setPayeeAccount(param.getPayeeAccount());
         entity.setCreateBy(loginUserInfo.getUserName());
         entity.setStatus(OwnerLoanRecordEnum.Status.APPROVE_WAIT.getCode());
         ownerLoanRecordDao.saveEntity(entity);