Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

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

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

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

@@ -122,13 +122,14 @@ public class NbBankServiceImpl implements NbBankService {
 
     /**
      * 调账
-     * @param orgMerSeqNo 商户流水号 （原）
      * @param amount 金额分
      */
     @Override
-    public NbBankOrderResultVO adjust(String orgMerSeqNo, Integer amount) {
+    public NbBankOrderResultVO adjust(Integer amount) {
+        String merSeqNo = idGenerateSnowFlake.nextIdToString(3L);
+
         String merDtTm = LocalDateTimeUtils.formatTime();
-        JSONObject data = bankThirdpartyService.fundTransferOrder(orgMerSeqNo, merDtTm, amount,
+        JSONObject data = bankThirdpartyService.fundTransferOrder(merSeqNo, merDtTm, amount,
                 null, null);
 
         NbBankOrderResultVO result = new NbBankOrderResultVO();
@@ -146,7 +147,7 @@ public class NbBankServiceImpl implements NbBankService {
         result.setAmount(amount);
         result.setRealAmount(amount);
         result.setMerDtTm(merDtTm);
-        result.setMerSeqNo(orgMerSeqNo);
+        result.setMerSeqNo(merSeqNo);
         result.setTransSeqNo(transSeqNo);
 
         return result;

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

@@ -414,13 +414,13 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
      * 5.10云账簿资金划转
      */
     @Override
-    public JSONObject fundTransferOrder(String orgMerSeqNo, String merDtTm, Integer trxAmt,
+    public JSONObject fundTransferOrder(String merSeqNo, String merDtTm, Integer trxAmt,
                                         String customerId, String payCustomerId) {
         try {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("transId", "CP01");                      //交易识别码 必填
             jsonObject.put("merId", nbBankConfig.getMerId());       //商户号 必填
-            jsonObject.put("merSeqNo", orgMerSeqNo);                //商户流水 必填
+            jsonObject.put("merSeqNo", merSeqNo);                   //商户流水 必填
 
             jsonObject.put("merDtTm", merDtTm);                     //商户交易时间 必填
             jsonObject.put("trxAmt", new BigDecimal(trxAmt).movePointLeft(2));                 //交易金额

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

@@ -15,7 +15,7 @@ public interface NbBankService {
 
     NbBankOrderResultVO getResult(String merSeqNo);
 
-    NbBankOrderResultVO adjust(String orgMerSeqNo, Integer amount);
+    NbBankOrderResultVO adjust(Integer amount);
 
     NbBankOrderResultVO refund(Integer type, String orgMerSeqNo, Integer amount, String orgTransSeqNo);
 

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

@@ -13,7 +13,7 @@ public interface NbBankThirdpartyService {
 
     JSONObject queryOrder(String orgMerSeqNo);
 
-    JSONObject fundTransferOrder(String orgMerSeqNo, String merDtTm,
+    JSONObject fundTransferOrder(String merSeqNo, String merDtTm,
                                  Integer trxAmt,
                                  String customerId, String payCustomerId);