From 34a5c00c80235213fca81689636c79fbad47a5fe Mon Sep 17 00:00:00 2001 From: gongzuming <gongzuming> Date: 星期五, 11 十月 2024 09:24:26 +0800 Subject: [PATCH] 支付优化 --- src/main/java/com/mzl/flower/pay/SybPayService.java | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/mzl/flower/pay/SybPayService.java b/src/main/java/com/mzl/flower/pay/SybPayService.java index 8144d60..0de4250 100644 --- a/src/main/java/com/mzl/flower/pay/SybPayService.java +++ b/src/main/java/com/mzl/flower/pay/SybPayService.java @@ -1,6 +1,7 @@ package com.mzl.flower.pay; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.net.URLEncoder; @@ -75,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 = ""; @@ -113,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 = ""; @@ -147,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 = ""; @@ -175,7 +188,9 @@ params.put("appid", SybConstants.SYB_APPID); params.put("version", "11"); params.put("reqsn", reqsn); - params.put("trxid", trxid); + if(StringUtils.isNotBlank(trxid)){ + params.put("trxid", trxid); + } params.put("randomstr", SybUtil.getValidatecode(8)); params.put("signtype", SybConstants.SIGN_TYPE); String appkey = ""; @@ -194,8 +209,7 @@ public static Map<String,String> handleResult(String result) throws Exception{ - System.out.println("通联支付返回结果:"+result); - log.info("ret:"+result); + log.info("通联支付返回结果:"+result); Map map = SybUtil.json2Obj(result, Map.class); if(map == null){ throw new Exception("返回数据错误"); -- Gitblit v1.9.3