From bef0ef19d792a16a31a59ec7beafc7b0885529fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 06 十一月 2019 15:36:31 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/wx/BanLiShopWXPayUtil.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/wx/BanLiShopWXPayUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/wx/BanLiShopWXPayUtil.java
index 1fd1a17..b19273b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/wx/BanLiShopWXPayUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/wx/BanLiShopWXPayUtil.java
@@ -9,6 +9,7 @@
import org.yeshi.utils.exception.WXOrderException;
import org.yeshi.utils.exception.WXPlaceOrderParamsException;
import org.yeshi.utils.wx.WXPayUtil;
+import org.yeshi.utils.wx.WXUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.shop.BanLiShopOrderUtil;
@@ -65,7 +66,9 @@
*/
public static boolean refund(String orderNo, BigDecimal money) throws WXOrderException {
boolean success = WXPayUtil.refund(BanLiShopOrderUtil.getWXPayOrderNo(orderNo), money, money, null,
- new WXAPPInfo(), MCH_ID, BanLiShopWXPayUtil.class.getClassLoader().getResourceAsStream(MCH_CERT_PATH));
+ new WXAPPInfo(Constant.getWXAccount(null, null).getGzAppId(),
+ Constant.getWXAccount(null, null).getGzAppSecret(), MCH_ID, MCH_KEY),
+ MCH_ID, BanLiShopWXPayUtil.class.getClassLoader().getResourceAsStream(MCH_CERT_PATH));
return success;
}
@@ -75,4 +78,29 @@
Constant.getWXAccount(null, null).getGzAppSecret(), MCH_ID, MCH_KEY));
}
+ /**
+ * 鏄惁鏀粯鎴愬姛
+ *
+ * @param orderNo
+ * @return
+ * @throws WXOrderException
+ */
+ public static boolean isPaySuccess(String orderNo) throws WXOrderException {
+ return WXPayUtil.isPaySuccess(BanLiShopOrderUtil.getWXPayOrderNo(orderNo),
+ new WXAPPInfo(Constant.getWXAccount(null, null).getGzAppId(),
+ Constant.getWXAccount(null, null).getGzAppSecret(), MCH_ID, MCH_KEY));
+ }
+
+ /**
+ * 绛惧悕鏄惁姝ｇ‘
+ *
+ * @param params
+ * @param sign
+ * @return
+ */
+ public static boolean signIsRight(Map<String, String> params, String sign) {
+ String newSign = WXUtil.getSignMD5(params, MCH_KEY);
+ return newSign.equalsIgnoreCase(sign);
+ }
+
}
--
Gitblit v1.8.0