From a02bed07c8281ae0fda850921eb7443393c5fb0c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期日, 29 十二月 2024 13:59:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/pay/SybPayService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mzl/flower/pay/SybPayService.java b/src/main/java/com/mzl/flower/pay/SybPayService.java
index 6c83049..0de4250 100644
--- a/src/main/java/com/mzl/flower/pay/SybPayService.java
+++ b/src/main/java/com/mzl/flower/pay/SybPayService.java
@@ -79,7 +79,9 @@
if (StringUtils.isNotBlank(oldtrxid)) {
params.put("oldtrxid", oldtrxid);
}
- params.put("oldreqsn", oldreqsn);
+ if(StringUtils.isNotBlank(oldreqsn)){
+ params.put("oldreqsn", oldreqsn);
+ }
params.put("randomstr", SybUtil.getValidatecode(8));
params.put("signtype", SybConstants.SIGN_TYPE);
String appkey = "";
@@ -116,7 +118,9 @@
params.put("version", "11");
params.put("trxamt", String.valueOf(trxamt));
params.put("reqsn", reqsn);
- params.put("oldreqsn", oldreqsn);
+ if(StringUtils.isNotBlank(oldreqsn)){
+ params.put("oldreqsn", oldreqsn);
+ }
if (StringUtils.isNotBlank(oldtrxid)) {
params.put("oldtrxid", oldtrxid);
}
@@ -152,7 +156,9 @@
params.put("cusid", SybConstants.SYB_CUSID);
params.put("appid", SybConstants.SYB_APPID);
params.put("version", "12");
- params.put("oldreqsn", oldreqsn);
+ if(StringUtils.isNotBlank(oldreqsn)){
+ params.put("oldreqsn", oldreqsn);
+ }
if (StringUtils.isNotBlank(oldtrxid)) {
params.put("oldtrxid", oldtrxid);
}
--
Gitblit v1.9.3