From fdb089cb8bee6099efcbd7b0ca2672c63cbb6784 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 11 十一月 2019 09:33:56 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
utils/src/main/java/org/yeshi/utils/wx/WXPayUtil.java | 70 +++++++++++++++++++++++++++++++++-
1 files changed, 67 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 9c3b6c0..7617ce8 100644
--- a/utils/src/main/java/org/yeshi/utils/wx/WXPayUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/wx/WXPayUtil.java
@@ -1,10 +1,12 @@
package org.yeshi.utils.wx;
import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
+import org.dom4j.DocumentException;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.StringUtil;
import org.yeshi.utils.entity.wx.RedPackParams;
@@ -200,7 +202,11 @@
String entity = WXUtil.loadWXMessage(map);
String result = HttpUtil.post("https://api.mch.weixin.qq.com/pay/unifiedorder", entity);
- System.out.println("缁熶竴涓嬪崟缁撴灉:" + result);
+ try {
+ System.out.println("缁熶竴涓嬪崟缁撴灉:" + new String(result.getBytes("GBK"), "UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
Map<String, String> resultMap = WXUtil.parseXML(result);
return resultMap;
@@ -261,8 +267,27 @@
map.put("out_trade_no", orderNo);
map.put("sign", WXUtil.getSignMD5(map, app.getMchKey()));
String result = HttpUtil.post("https://api.mch.weixin.qq.com/pay/orderquery", WXUtil.loadWXMessage(map));
- System.out.println("璁㈠崟鏌ヨ缁撴灉:" + result);
- Map<String, String> resultMap = WXUtil.parseXML(result);
+ try {
+ try {
+ result = new String(result.getBytes("GBK"), "UTF-8");
+ } catch (UnsupportedEncodingException e1) {
+ e1.printStackTrace();
+ }
+ System.out.println("璁㈠崟鏌ヨ缁撴灉:" + new String(result.getBytes("GBK"), "UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ Map<String, String> resultMap = null;
+ try {
+ resultMap = WXUtil.parseXML(result);
+ } catch (Exception e) {
+ try {
+ result = new String(result.getBytes("GBK"), "UTF-8");
+ } catch (UnsupportedEncodingException e1) {
+ e1.printStackTrace();
+ }
+ resultMap = WXUtil.parseXML(result);
+ }
if ("SUCCESS".equalsIgnoreCase(resultMap.get("return_code"))
&& "SUCCESS".equalsIgnoreCase(resultMap.get("result_code"))) {
if ("SUCCESS".equalsIgnoreCase(resultMap.get("trade_state")))// 鏀粯鎴愬姛
@@ -274,4 +299,43 @@
}
}
+ /**
+ *
+ * @param refundOrderNo
+ * -閫�娆惧崟鍙�
+ * @param app
+ * @return
+ * @throws WXOrderException
+ */
+ public static boolean isRefundSuccess(String refundOrderNo, WXAPPInfo app) throws WXOrderException {
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("appid", app.getAppId());
+ map.put("mch_id", app.getMchId());
+ map.put("nonce_str", StringUtil.getRandomCode(32));
+ map.put("out_refund_no", refundOrderNo);
+ map.put("sign", WXUtil.getSignMD5(map, app.getMchKey()));
+ String result = HttpUtil.post("https://api.mch.weixin.qq.com/pay/refundquery", WXUtil.loadWXMessage(map));
+ System.out.println("璁㈠崟鏌ヨ缁撴灉:" + result);
+ Map<String, String> resultMap = null;
+ try {
+ resultMap = WXUtil.parseXML(result);
+ } catch (Exception e) {
+ try {
+ result = new String(result.getBytes("GBK"), "UTF-8");
+ } catch (UnsupportedEncodingException e1) {
+ e1.printStackTrace();
+ }
+ resultMap = WXUtil.parseXML(result);
+ }
+ if ("SUCCESS".equalsIgnoreCase(resultMap.get("return_code"))
+ && "SUCCESS".equalsIgnoreCase(resultMap.get("result_code"))) {
+ if ("SUCCESS".equalsIgnoreCase(resultMap.get("refund_status_0")))// 閫�娆炬垚鍔�
+ return true;
+ else
+ return false;
+ } else {
+ throw new WXOrderException(100, "寰俊鏀粯鎺ュ彛鍑洪敊:" + result);
+ }
+ }
+
}
--
Gitblit v1.8.0