Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

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

@@ -157,7 +157,7 @@ public class NbBankServiceImpl implements NbBankService {
 
     /**
      * 退款
-     * @Param type: 1普通退款 2银行转账退款
+     * @Param type: 1普通退款 2银行转账退款 3银联订单支付撤单
      * @param orgMerSeqNo 商户流水号（原）
      * @param amount 金额分
      * @param orgTransSeqNo 第三方流水号 (原)

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

@@ -492,7 +492,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
      *         "rspTime": "10:18:35:131"
      *     }
      * }
-     * @Param type: 1普通退款 2银行转账退款
+     * @Param type: 1普通退款 2银行转账退款 3银联订单支付撤单
      * @return
      */
     @Override
@@ -501,7 +501,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
                              String orgMerSeqNo, String coreSeqNo) {
         try {
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("transId", type==1? "TK01" : "TK02");                   //交易识别码 必填
+            jsonObject.put("transId", getRefundTransId(type));                     //交易识别码 必填
             jsonObject.put("merId", nbBankConfig.getMerId());                      //商户号 必填
 
             jsonObject.put("merSeqNo", merSeqNo);           //商户流水 必填
@@ -705,4 +705,13 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
         nbBankRecordDao.saveEntity(record);
     }
 
+    /**
+     * 获取退款交易识别码
+     */
+    private String getRefundTransId(Integer type){
+        if (type == 1) {return "TK01";}
+        if (type == 2) {return "TK02";}
+        return "CD01";
+
+    }
 }