From 96abc87da07408ef817d9086ea71ba4c287aa474 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 09 十二月 2024 11:52:07 +0800
Subject: [PATCH] Merge branch 'master-v5' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v5
---
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