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

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/CarrierOwnerLoanAccountVO.java

 package com.clx.performance.vo.pc.loan.carrier;
 
+import com.clx.performance.enums.OwnerAccountEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModel;
@@ -32,7 +33,11 @@ public class CarrierOwnerLoanAccountVO {
     @ApiModelProperty(value = "联系电话", example = "13000000000")
     private String mobile;
     @ApiModelProperty(value = "默认 3：借款账户", example = "3")
-    private Integer accountType;
+    private String accountType;
+
+    public String getAccountType(){
+        return OwnerAccountEnum.AccountTypeStatus.LOAN_ACCOUNT.getMsg();
+    }
 
     @ApiModelProperty(value = "账户余额 (元) ", example = "1.23")
     private BigDecimal amount;

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

@@ -411,7 +411,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
                 PerformanceResultEnum.DATA_NOT_FIND);
         CarrierOwnerOrderPaymentDetailVO vo = ownerLoanRecordStruct.convertOrderPaymentDetail(ownerLoanRecord);
         vo.setPayer(ownerLoanRecord.getBorrower());
-        vo.setPayerAccount(ownerLoanRecord.getPayeeAccount());
+        vo.setPayerAccount(ownerLoanRecord.getBorrowerAccount());
         ClxPayeeConfig.PayeeConfig payeeMap = ClxPayeeConfig.getPayee(ClxPayeeConfig.XXH_ID);
         vo.setPayee(payeeMap.getName());
         vo.setPayeeAccount(payeeMap.getAccount());
@@ -578,7 +578,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         BankTrade bankTrade = bankTradeDao.selectByMerchantRunningWaterNo(merSeqNo).get();
         OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getOneByField(OwnerLoanRecord::getLoanNo, bankTrade.getRelationNo())
                 .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        if (Objects.equals(ownerLoanRecord.getStatus(), OwnerLoanRecordEnum.Status.PAYING.getCode())) {
+        if (!Objects.equals(ownerLoanRecord.getStatus(), OwnerLoanRecordEnum.Status.PAYING.getCode())) {
             log.info("借款单非支付中状态, loanNo:{}", bankTrade.getRelationNo());
             return;
         }
@@ -597,7 +597,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getOneByField(OwnerLoanRecord::getLoanNo, bankTrade.getRelationNo())
                 .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
-        if (Objects.equals(ownerLoanRecord.getStatus(), OwnerLoanRecordEnum.Status.PAYING.getCode())) {
+        if (!Objects.equals(ownerLoanRecord.getStatus(), OwnerLoanRecordEnum.Status.PAYING.getCode())) {
             log.info("借款单非支付中状态, loanNo:{}", ownerLoanRecord.getLoanNo());
             return;
         }