Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

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

@@ -2,6 +2,7 @@ package com.clx.performance.service.impl.thirdparty.nbbank;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.clx.performance.config.nbbank.NbBankConfig;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.nbbank.NbBankRecordEnum;
 import com.clx.performance.service.thirdparty.nbbank.NbBankNotifyService;
@@ -13,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 
@@ -20,6 +22,9 @@ import java.math.BigDecimal;
 @Service
 public class NbBankNotifyServiceImpl implements NbBankNotifyService {
 
+    @Autowired
+    private NbBankConfig nbBankConfig;
+
     @Autowired
     private NbBankService bankService;
 
@@ -64,13 +69,14 @@ public class NbBankNotifyServiceImpl implements NbBankNotifyService {
      *     }
      * }
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void payNotify(String body) {
         log.info("宁波银行回调, data:{}", JSON.toJSONString(body));
 
         try {
             RequestApiData requestApiData = new RequestApiData();
-            requestApiData.setAppkey("77667c76_3503_4c04_95f7_fc10938c7942");
+            requestApiData.setAppkey(nbBankConfig.getAppKey());
             requestApiData.setData(JSON.parseObject(body));
             requestApiData.setServiceId("notifyMerchant");