From 5ff8fb8bd9d298def47437b24e77c8879cdc37d2 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:36:39 +0800
Subject: [PATCH] 1.定时任务-待付款-15分钟 2.领券中心：根据领取次数判断是否已领取 3.付款：优惠券自动领取最大优惠券
---
src/main/java/com/mzl/flower/pay/SybPayService.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mzl/flower/pay/SybPayService.java b/src/main/java/com/mzl/flower/pay/SybPayService.java
index 24be56a..0de4250 100644
--- a/src/main/java/com/mzl/flower/pay/SybPayService.java
+++ b/src/main/java/com/mzl/flower/pay/SybPayService.java
@@ -76,8 +76,12 @@
params.put("version", "11");
params.put("trxamt", String.valueOf(trxamt));
params.put("reqsn", reqsn);
- params.put("oldtrxid", oldtrxid);
- params.put("oldreqsn", oldreqsn);
+ if (StringUtils.isNotBlank(oldtrxid)) {
+ params.put("oldtrxid", oldtrxid);
+ }
+ if(StringUtils.isNotBlank(oldreqsn)){
+ params.put("oldreqsn", oldreqsn);
+ }
params.put("randomstr", SybUtil.getValidatecode(8));
params.put("signtype", SybConstants.SIGN_TYPE);
String appkey = "";
@@ -114,8 +118,12 @@
params.put("version", "11");
params.put("trxamt", String.valueOf(trxamt));
params.put("reqsn", reqsn);
- params.put("oldreqsn", oldreqsn);
- params.put("oldtrxid", oldtrxid);
+ if(StringUtils.isNotBlank(oldreqsn)){
+ params.put("oldreqsn", oldreqsn);
+ }
+ if (StringUtils.isNotBlank(oldtrxid)) {
+ params.put("oldtrxid", oldtrxid);
+ }
params.put("randomstr", SybUtil.getValidatecode(8));
params.put("signtype", SybConstants.SIGN_TYPE);
String appkey = "";
@@ -148,8 +156,12 @@
params.put("cusid", SybConstants.SYB_CUSID);
params.put("appid", SybConstants.SYB_APPID);
params.put("version", "12");
- params.put("oldreqsn", oldreqsn);
- params.put("oldtrxid", oldtrxid);
+ if(StringUtils.isNotBlank(oldreqsn)){
+ params.put("oldreqsn", oldreqsn);
+ }
+ if (StringUtils.isNotBlank(oldtrxid)) {
+ params.put("oldtrxid", oldtrxid);
+ }
params.put("randomstr", SybUtil.getValidatecode(8));
params.put("signtype", SybConstants.SIGN_TYPE);
String appkey = "";
--
Gitblit v1.9.3