From 9bb9952db0b22034b4aea1f486df827d77a03031 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 17 十月 2024 14:41:35 +0800
Subject: [PATCH] add:销售合计统计运费+打包费;售后扣平台款字段，增加增加统计售后“打包运费（散户）”字段
---
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