Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

performance-web/src/main/java/com/clx/performance/controller/temp/TempBankController.java

@@ -67,9 +67,9 @@ public class TempBankController {
 
     @ApiOperation(value = "退款", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/refund", method = RequestMethod.POST)
-    public Result<NbBankOrderResultVO> refund(String orgMerSeqNo, Integer amount, String orgTransSeqNo) {
+    public Result<NbBankOrderResultVO> refund(Integer type, String orgMerSeqNo, Integer amount, String orgTransSeqNo) {
 
-        return Result.ok(bankService.refund(orgMerSeqNo,amount,orgTransSeqNo));
+        return Result.ok(bankService.refund(type,orgMerSeqNo,amount,orgTransSeqNo));
     }
 
     @ApiOperation(value = "回调", notes = "<br>By:艾庆国")

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

@@ -154,16 +154,17 @@ public class NbBankServiceImpl implements NbBankService {
 
     /**
      * 退款
+     * @Param type: 1普通退款 2银行转账退款
      * @param orgMerSeqNo 商户流水号（原）
      * @param amount 金额分
      * @param orgTransSeqNo 第三方流水号 (原)
      */
     @Override
-    public NbBankOrderResultVO refund(String orgMerSeqNo, Integer amount, String orgTransSeqNo) {
+    public NbBankOrderResultVO refund(Integer type, String orgMerSeqNo, Integer amount, String orgTransSeqNo) {
         String merSeqNo = idGenerateSnowFlake.nextIdToString(3L);
 
         String merDtTm = LocalDateTimeUtils.formatTime();
-        JSONObject data = bankThirdpartyService.refund(merSeqNo, merDtTm, amount,
+        JSONObject data = bankThirdpartyService.refund(type, merSeqNo, merDtTm, amount,
                 orgMerSeqNo, orgTransSeqNo);
 
         NbBankOrderResultVO result = new NbBankOrderResultVO();

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

@@ -473,19 +473,20 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
     /**
      * 退款
      * 5.2退款
+     * @Param type: 1普通退款 2银行转账退款
      * @return
      */
     @Override
-    public JSONObject refund(String merSeqNo, String merDtTm,
+    public JSONObject refund(Integer type, String merSeqNo, String merDtTm,
                              Integer amount,
                              String orgMerSeqNo, String coreSeqNo) {
         try {
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("transId", "IP01");              //交易识别码 必填
+            jsonObject.put("transId", type==1? "TK01" : "TK02");                   //交易识别码 必填
             jsonObject.put("merId", nbBankConfig.getMerId());                      //商户号 必填
 
             jsonObject.put("merSeqNo", merSeqNo);           //商户流水 必填
-            jsonObject.put("merDtTm", LocalDateTimeUtils.formatTime());            //商户时间 必填
+            jsonObject.put("merDtTm", merDtTm);             //商户时间 必填
 
             jsonObject.put("trxAmt", new BigDecimal(amount).movePointLeft(2));     //订单金额 必填
             jsonObject.put("orgMerSeqNo", orgMerSeqNo);     //原订单流水号 必填

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

@@ -17,7 +17,7 @@ public interface NbBankService {
 
     NbBankOrderResultVO adjust(String orgMerSeqNo, Integer amount);
 
-    NbBankOrderResultVO refund(String orgMerSeqNo, Integer amount, String orgTransSeqNo);
+    NbBankOrderResultVO refund(Integer type, String orgMerSeqNo, Integer amount, String orgTransSeqNo);
 
     void orderPayCallback(String merSeqNo, String transSeqNo,
                           Integer trxAmt, Integer realTrxAmt,

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

@@ -17,7 +17,7 @@ public interface NbBankThirdpartyService {
                                  Integer trxAmt,
                                  String customerId, String payCustomerId);
 
-    JSONObject refund(String merSeqNo, String merDtTm, Integer amount,
+    JSONObject refund(Integer type, String merSeqNo, String merDtTm, Integer amount,
                       String orgMerSeqNo, String coreSeqNo);
 
     void recordSave(Integer type, SDKRequest request, SDKResponse response);