转账支付需要返回识别码

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

@@ -129,6 +129,7 @@ public enum PerformanceResultEnum implements ResultEnum {
 
     OWNER_LOAN_RECORD_PAY_STATUS_ERROR(1850, "状态已变更无法支付"),
     OWNER_LOAN_RECORD_CANCEL_STATUS_ERROR(1851, "状态已变更无法取消"),
+    OWNER_LOAN_RECORD_PAY_WAIT_ERROR(1852,"当前借款单状态不是待付款"),
 
     ;
     private final int code;

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

@@ -613,11 +613,11 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         }
 
 
-
     }
 
     /**
      * 执行货主未处理借款标志的计费
+     *
      * @param ownerUserNo
      */
     @Override
@@ -749,7 +749,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
     }
 
     @Override
-    public String sendLoanSms(String mobile,Long loanNo) {
+    public String sendLoanSms(String mobile, Long loanNo) {
         AliSmsMessageReq req = new AliSmsMessageReq();
         req.setTemplateCode(messageConfig.getRepaymentTemplateCode());
         JSONObject jsonObject = new JSONObject();
@@ -764,8 +764,9 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
 
         return UUID.randomUUID().toString();
     }
+
     @Override
-    public String sendOrderPaySms(String mobile,String payee, String payeeAccount) {
+    public String sendOrderPaySms(String mobile, String payee, String payeeAccount) {
         AliSmsMessageReq req = new AliSmsMessageReq();
         req.setTemplateCode(messageConfig.getOrderPayTemplateCode());
         JSONObject jsonObject = new JSONObject();
@@ -785,11 +786,14 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
     @Override
     public void ownerLoanRecordSubmitNbBank(CarrierOwnerLoanRecordApproveParam param) {
         OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getOneByField(OwnerLoanRecord::getLoanNo, param.getLoanNo()).get();
+        if (!OwnerLoanRecordEnum.Status.PAY_WAIT.getCode().equals(ownerLoanRecord.getStatus())) {
+            throw new ServiceSystemException(PerformanceResultEnum.OWNER_LOAN_RECORD_PAY_WAIT_ERROR);
+        }
         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);
-        fundPayProcess(param,ownerLoanRecord,borrower);
+                .orElseThrow(PerformanceResultEnum.BORROWER_CONFIG_TYPE_NOT_SUPPORT_ERROR);
+        Borrower borrower = borrowerDao.getEntityByKey(ownerLoanRecord.getBorrowerId())
+                .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        fundPayProcess(param, ownerLoanRecord, borrower);
     }
 
 }