借款到账后执行重新借款标志处理

performance-api/src/main/java/com/clx/performance/enums/loan/BankTradeEnum.java

@@ -13,7 +13,7 @@ public enum BankTradeEnum {
     @Getter
     @AllArgsConstructor
     public enum TradeType {
-        ORDER_DIRECT_PAY(1, "订单支付"),
+        ORDER_DIRECT_PAY(3, "订单支付"),
         ORDER_TRANSFER_PAY(2, "转账支付"),
         ;
 

performance-web/src/main/java/com/clx/performance/dao/impl/loan/BankTradeDaoImpl.java

@@ -35,4 +35,14 @@ public class BankTradeDaoImpl extends BaseDaoImpl<BankTradeMapper, BankTrade, In
                 )
                 .map(super::getOne);
     }
+
+    @Override
+    public Optional<BankTrade> selectByRelationNo(String relationNo) {
+        return Optional.of(relationNo)
+                .map(item -> lQrWrapper()
+                        .eq(BankTrade::getRelationNo, item)
+                        .orderByDesc(BankTrade::getId)
+                        .last("limit 1")
+                )
+                .map(super::getOne);    }
 }

performance-web/src/main/java/com/clx/performance/dao/loan/BankTradeDao.java

@@ -18,4 +18,7 @@ public interface BankTradeDao extends BaseDao<BankTradeMapper, BankTrade, Intege
 
     Optional<BankTrade> selectByMerchantRunningWaterNo(String merchantRunningWaterNo);
 
+    Optional<BankTrade> selectByRelationNo(String relationNo);
+
+
 }

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

@@ -563,6 +563,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void ownerLoanRecordCancelPay(String loanNo) {
         OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getOneByField(OwnerLoanRecord::getLoanNo, loanNo)
                 .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -587,6 +588,11 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.APPROVE_WAIT.getCode());
         ownerLoanRecordDao.updateStatusById(ownerLoanRecord);
 
+        BankTrade bankTrade = bankTradeDao.selectByRelationNo(loanNo).get();
+        Integer tradeType = bankTrade.getTradeType();
+        // 调用宁波退款
+        bankService.refund(tradeType, bankTrade.getMerchantRunningWaterNo(), Integer.valueOf(ownerLoanRecord.getLoanBalance().movePointRight(2).toString()), bankTrade.getRunningWaterOpenNo());
+
     }