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

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

@@ -370,7 +370,6 @@ public class OrderChildLoanComponent {
                 waterRecord.setChildNo(childNo);
                 waterRecord.setRunningWaterType(OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_THAW.getCode());
                 waterRecord.setAlterationBalance(balance);
-
                 account = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo,
                         userNo).get();
                 waterRecord.setAccountBalance(account.getVirtuallyAccountBalance().add(account.getFundingAccountBalance()));

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

@@ -155,8 +155,6 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
 
         OwnerLoanRecord entity = new OwnerLoanRecord();
         LocalDateTime createTime = LocalDateTime.now();
-        LocalDateTime loanRepaymentTime = createTime.plusDays(param.getExpireDay());
-        entity.setLoanRepaymentTime(loanRepaymentTime);
         entity.setLoanNo(idGenerateSnowFlake.nextId(1L));
         entity.setCreateTime(createTime);
         entity.setOwnerUserNo(loginUserInfo.getUserNo());
@@ -191,8 +189,8 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
         }
         if (param.getStatus()) {
-            borrowerConfigDao.selectByBorrowerIdAndType(ownerLoanRecord.getBorrowerId(), param.getLoanType())
-                    .orElseThrow(PerformanceResultEnum.BORROWER_CONFIG_TYPE_NOT_SUPPORT_ERROR);
+            BorrowerConfig borrowerConfig = borrowerConfigDao.selectByBorrowerIdAndType(ownerLoanRecord.getBorrowerId(),
+                    param.getLoanType()).orElseThrow(PerformanceResultEnum.BORROWER_CONFIG_TYPE_NOT_SUPPORT_ERROR);
             Borrower borrower = borrowerDao.getEntityByKey(ownerLoanRecord.getBorrowerId())
                     .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
@@ -216,6 +214,9 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
             ownerLoanRecord.setApproveBy(TokenUtil.getLoginUserInfo().getUserName());
             ownerLoanRecord.setApproveTime(LocalDateTime.now());
 
+            LocalDateTime loanRepaymentTime = LocalDateTime.now().plusDays(borrowerConfig.getDay());
+            ownerLoanRecord.setLoanRepaymentTime(loanRepaymentTime);
+
             if (OwnerLoanRecordEnum.LoanType.FUND.getCode().equals(param.getLoanType())) {
                 ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.PAY_WAIT.getCode());
                 //fundPayProcess(param, ownerLoanRecord, borrower);

performance-web/src/main/java/com/clx/performance/service/impl/settle/NetworkDriverRunningWaterRecordServiceImpl.java

@@ -36,6 +36,8 @@ import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
+import static java.util.Locale.filter;
+
 /**
  * @author kavin
  * Date 2023-12-19
@@ -240,8 +242,9 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
 
     @Override
     public void generateNetworkCaseOutRecord(SettlementDriverDetail settlementDriverDetail) {
-        BankCardVO bankCardVO = Optional.ofNullable(driverFeign.getDriverCardInfo(settlementDriverDetail.getDriverUserNo()))
-                .filter(Result::succeed).map(Result::getData).orElseThrow(ResultCodeEnum.FAIL);
+        Result<BankCardVO> result = driverFeign.getDriverCardInfo(settlementDriverDetail.getDriverUserNo());
+        log.info("获取司机银行卡信息：{}", JSONUtil.parse(result));
+        BankCardVO bankCardVO = result.getData();
         NetworkCaseOutRecord build = NetworkCaseOutRecord.builder()
                 .caseOutNo(idGenerateSnowFlake.nextId(4L))
                 .driverUserNo(settlementDriverDetail.getDriverUserNo())