From 4706fa0dcd761c13f0f7f33e4e7ab804e0a21f4f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 12 十月 2019 19:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
utils/src/main/java/org/yeshi/utils/wx/WXPayUtil.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/utils/src/main/java/org/yeshi/utils/wx/WXPayUtil.java b/utils/src/main/java/org/yeshi/utils/wx/WXPayUtil.java
index 1c824bf..15006fc 100644
--- a/utils/src/main/java/org/yeshi/utils/wx/WXPayUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/wx/WXPayUtil.java
@@ -57,7 +57,6 @@
Map<String, String> map = new HashMap<>();
map.put("nonce_str", StringUtil.getRandomCode(32));
- map.put("sign", WXUtil.getSignMD5(map, params.getKey()));
map.put("mch_billno", params.getBillno());
map.put("mch_id", params.getMchId());
map.put("wxappid", params.getWxappId());
@@ -69,8 +68,14 @@
map.put("client_ip", params.getClientIp());
map.put("act_name", params.getActName());
map.put("remark", params.getRemark());
- map.put("scene_id", params.getSceneId());
- map.put("risk_info", params.getRiskInfo());
+
+ if (!StringUtil.isNullOrEmpty(params.getSceneId()))
+ map.put("scene_id", params.getSceneId());
+
+ if (!StringUtil.isNullOrEmpty(params.getRiskInfo()))
+ map.put("risk_info", params.getRiskInfo());
+
+ map.put("sign", WXUtil.getSignMD5(map, params.getKey()));
String entity = WXUtil.loadWXMessage(map);
try {
String result = HttpUtil.httpsPost("https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack",
--
Gitblit v1.8.0