Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankThirdpartyServiceImpl.java

@@ -9,6 +9,7 @@ import com.clx.performance.enums.nbbank.NbBankRecordEnum;
 import com.clx.performance.model.nbbank.NbBankRecord;
 import com.clx.performance.service.thirdparty.nbbank.NbBankThirdpartyService;
 import com.clx.performance.utils.LocalDateTimeUtils;
+import com.clx.performance.utils.spring.ApplicationContextUtils;
 import com.msl.common.exception.ServiceSystemException;
 import com.nbopen.api.*;
 import lombok.extern.slf4j.Slf4j;
@@ -155,7 +156,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
             SDKResponse response = NBOpenSDK.send(request);
             log.info("宁波银行, 下单(directBankTransferOrder), 结果: {}", JSON.toJSONString(response));
 
-            recordSave(NbBankRecordEnum.Type.DIRECT_BANK_TRANSFER_ORDER.getCode(), request, response);
+            ApplicationContextUtils.getBean(NbBankThirdpartyService.class).recordSave(NbBankRecordEnum.Type.DIRECT_BANK_TRANSFER_ORDER.getCode(), request, response);
 
             JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
             JSONObject data = responseJson.getJSONObject("data");
@@ -254,7 +255,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
             SDKResponse response = NBOpenSDK.send(request);
             log.info("宁波银行, 下单(unionPayDirectOrder), 结果: {}", JSON.toJSONString(response));
 
-            recordSave(NbBankRecordEnum.Type.UNION_PAY_DIRECT_ORDER.getCode(), request, response);
+            ApplicationContextUtils.getBean(NbBankThirdpartyService.class).recordSave(NbBankRecordEnum.Type.UNION_PAY_DIRECT_ORDER.getCode(), request, response);
 
             JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
             JSONObject data = responseJson.getJSONObject("data");
@@ -409,7 +410,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
             SDKResponse response = NBOpenSDK.send(request);
             log.info("宁波银行, 查询交易结果(queryOrder), 结果: {}", JSON.toJSONString(response));
 
-            recordSave(NbBankRecordEnum.Type.QUERY_ORDER.getCode(), request, response);
+            ApplicationContextUtils.getBean(NbBankThirdpartyService.class).recordSave(NbBankRecordEnum.Type.QUERY_ORDER.getCode(), request, response);
 
             JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
             JSONObject data = responseJson.getJSONObject("data");
@@ -470,7 +471,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
             SDKResponse response = NBOpenSDK.send(request);
             log.info("宁波银行, 调账接口(fundTransferOrder), 结果: {}", JSON.toJSONString(response));
 
-            recordSave(NbBankRecordEnum.Type.FUND_TRANSFER_ORDER.getCode(), request, response);
+            ApplicationContextUtils.getBean(NbBankThirdpartyService.class).recordSave(NbBankRecordEnum.Type.FUND_TRANSFER_ORDER.getCode(), request, response);
 
             JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
             JSONObject data = responseJson.getJSONObject("data");
@@ -556,7 +557,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
             SDKResponse response = NBOpenSDK.send(request);
             log.info("宁波银行, 退款(refund), 结果: {}", JSON.toJSONString(response));
 
-            recordSave(NbBankRecordEnum.Type.REFUND.getCode(), request, response);
+            ApplicationContextUtils.getBean(NbBankThirdpartyService.class).recordSave(NbBankRecordEnum.Type.REFUND.getCode(), request, response);
 
             JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
             JSONObject data = responseJson.getJSONObject("data");
@@ -575,6 +576,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
         throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_API_ERROR);
     }
 
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     @Override
     public void recordSave(Integer type, SDKRequest request, SDKResponse response) {
 
@@ -704,7 +706,6 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
 
     }
 
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void recordSave(Integer type,
                            String merId, String merSeqNo, String merDtTm, String transSeqNo,
                            Integer amount,