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

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -125,6 +125,7 @@ public enum PerformanceResultEnum implements ResultEnum {
     NB_BANK_ORDER_PAY_ERROR(1803, "宁波银行订单支付失败"),
 
     GET_LOAN_RECORD(1901, "货主借款失败"),
+    OWNER_ACCOUNT_ERROR(1902, "货主货款不足"),
 
 
     OWNER_LOAN_RECORD_PAY_STATUS_ERROR(1850, "状态已变更无法支付"),

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

 package com.clx.performance.vo.pc.loan.carrier;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.msl.common.config.KeyColumn;
-import com.msl.common.model.HasKey;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
-import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * @author kavin
@@ -25,28 +17,21 @@ import java.time.LocalDateTime;
 @Builder
 public class CarrierOwnerPaymentVO{
 
-   
     private Integer id;
    
-   
     @ApiModelProperty("付款金额")
     private BigDecimal paymentBalance;
 
-   
     @ApiModelProperty("付款方")
     private String payment;
 
-   
     @ApiModelProperty("付款账户")
     private String paymentAccount;
 
-   
     @ApiModelProperty("收款方")
     private String payee;
 
-   
     @ApiModelProperty("收款账户")
     private String payeeAccount;
 
-
 }

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

@@ -146,7 +146,7 @@ public class OrderChildLoanComponent {
         }
         log.info("8.预付运费不够,开始进行借款判断");
         // 进行借款判断
-        OwnerLoanAccount ownerLoanAccount = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo, ownerInfoFeignVO.getUserNo()).get();
+        OwnerLoanAccount ownerLoanAccount = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo, ownerInfoFeignVO.getUserNo()).orElseThrow(PerformanceResultEnum.OWNER_ACCOUNT_ERROR);
         BigDecimal ownerLoanAccountSum = ownerLoanAccount.getVirtuallyUsableBalance().add(ownerLoanAccount.getFundingUsableBalance());
 
         if (ownerLoanAccountSum.compareTo(orderChildPrice) < 0) {

performance-web/src/main/java/com/clx/performance/listener/OwnerLoanListener.java

@@ -53,7 +53,7 @@ public class OwnerLoanListener {
             //未借款
             settlementDriverDetail.setLoanFlag(OwnerLoanRecordEnum.LoanFlag.NO_LOAN.getCode());
             applicationEventPublisher.publishEvent(new SettlementUpdateEvent(this, settlementDriverDetail, settlementOwnerDetail));
-            throw e;
+            return;
         }
         settlementOwnerDetailDao.updateInvoiceType(settlementOwnerDetail);
         settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail);

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

@@ -772,7 +772,6 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         JSONObject jsonObject = new JSONObject();
         jsonObject.set("companyName", payee);
         jsonObject.set("bankAccount", payeeAccount);
-        jsonObject.set("bankName", "");
         req.setChannelId(messageConfig.getChannelId());
         req.setAppId(messageConfig.getAppId().toString());
         req.setMobile(mobile);

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

@@ -210,7 +210,6 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
         JSONObject jsonObject = new JSONObject();
         jsonObject.set("companyName", payee);
         jsonObject.set("bankAccount", payeeAccount);
-        jsonObject.set("bankName", "");
         req.setChannelId(messageConfig.getChannelId());
         req.setAppId(messageConfig.getAppId().toString());
         req.setMobile(mobile);