货主还款回调判断

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

@@ -9,6 +9,7 @@ import com.clx.performance.dao.loan.OwnerRepaymentDao;
 import com.clx.performance.enums.OwnerAccountEnum;
 import com.clx.performance.enums.loan.BankTradeEnum;
 import com.clx.performance.enums.loan.OwnerLoanRecordEnum;
+import com.clx.performance.enums.loan.OwnerRePaymentEnum;
 import com.clx.performance.extranal.user.OwnerInfoService;
 import com.clx.performance.model.OwnerBindCardRecord;
 import com.clx.performance.model.loan.BankTrade;
@@ -129,7 +130,7 @@ public class OwnerLoanAccountServiceImpl implements OwnerLoanAccountService {
             ownerRepayment.setCloseOrderTime(orderPayResultVO.getCloseDtTm());
             bankTrade.setTradeType(BankTradeEnum.TradeType.ORDER_TRANSFER_PAY.getCode());
         }
-        ownerRepayment.setStatus(OwnerLoanRecordEnum.Status.PAYING.getCode());
+        ownerRepayment.setStatus(OwnerRePaymentEnum.Status.PAYING.getCode());
         ownerRepayment.setPayChannel(param.getPayChannel());
         OwnerInfoFeignVO ownerInfo = ownerInfoService.getOwnerInfo(TokenUtil.getLoginUserInfo().getUserNo());
         ownerRepayment.setPayment(ownerBindCardRecord.getAccountBankName());

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

@@ -277,6 +277,10 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
             return;
         }
         OwnerRepayment ownerRepayment = optional.get();
+        if (!ownerRepayment.getStatus().equals(OwnerRePaymentEnum.Status.PAYING.getCode())) {
+            log.info("当前还款信息状态不是付款中,数据为{}", JSONUtil.parse(ownerRepayment));
+            return;
+        }
 
         ownerRepayment.setStatus(OwnerRePaymentEnum.Status.PAY_SUCCESS.getCode());
         // 更新还款信息
@@ -285,10 +289,6 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
         OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getOneByField(OwnerLoanRecord::getLoanNo,
                 ownerRepayment.getLoanNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
-        if (!ownerRepayment.getStatus().equals(OwnerRePaymentEnum.Status.PAYING.getCode())) {
-            log.info("当前还款信息状态不是付款中,数据为{}", JSONUtil.parse(ownerRepayment));
-            return;
-        }
 
         while (true) {
             OwnerLoanAccount ownerLoanAccount = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo,