From bfce748e37a753c729e15dd233600379f504d019 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 13:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java | 69 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 19 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java
index 5d8bc00..84e9cec 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java
@@ -2,6 +2,8 @@
import cn.dreampie.encription.EncriptionKit;
import cn.hutool.core.codec.Base64;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
@@ -13,6 +15,7 @@
import com.github.binarywang.wxpay.service.WxPayService;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.util.IpUtil;
+import com.sandu.ximon.admin.dto.wxquerydto.WxOrderDto;
import com.sandu.ximon.admin.pay.wxpay.UsrWxPayConfigService;
import com.sandu.ximon.dao.domain.WxConfigEntity;
import lombok.AllArgsConstructor;
@@ -34,18 +37,25 @@
private final com.github.binarywang.wxpay.service.WxPayService wxPayService;
//private final WxPayProperties wxPayProperties;
+// public static final String WECHAT_ORDER_PAY_CALLBACK_URL = "http://49.235.239.118:20012/callback/pay/wechatCallback";
public static final String WECHAT_ORDER_PAY_CALLBACK_URL = "http://49.235.239.118:20012/callback/pay/wechatCallback";
+ //寰俊璁㈠崟鐘舵�佹煡璇�
+ public static final String WECHAT_ORDER_QUETY_URL = "https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/";
+ public static final String WECHAT_ORDER_QUETY = "?mchid=";
+
private final UsrWxPayConfigService wxPayConfigService;
+
+
/**
* app鏀粯
*
* @param body 鍟嗗搧鎻忚堪
- * @param orderId 璁㈠崟id
+ * @param
* @param totalFee 鏀粯閲戦锛堝垎锛�
* @return
*/
- public SortedMap<Object, Object> appPay(String body, String orderSn, int totalFee,Long poleId) {
+ public SortedMap<Object, Object> appPay(String body, String orderSn, int totalFee, Long poleId) {
WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
WxPayUnifiedOrderRequest wxPayUnifiedOrderRequest = new WxPayUnifiedOrderRequest();
wxPayUnifiedOrderRequest.setBody(body);
@@ -94,21 +104,42 @@
}
}
-/* private String createSign(SortedMap<Object, Object> parameters) {
- StringBuffer sb = new StringBuffer();
- Set es = parameters.entrySet();// 鎵�鏈夊弬涓庝紶鍙傜殑鍙傛暟鎸夌収accsii鎺掑簭锛堝崌搴忥級
- for (Object e : es) {
- Map.Entry entry = (Map.Entry) e;
- String k = (String) entry.getKey();
- Object v = entry.getValue();
- if (null != v && !"".equals(v) && !"sign".equals(k) && !"key".equals(k)) {
- sb.append(k + "=" + v + "&");
+ /* private String createSign(SortedMap<Object, Object> parameters) {
+ StringBuffer sb = new StringBuffer();
+ Set es = parameters.entrySet();// 鎵�鏈夊弬涓庝紶鍙傜殑鍙傛暟鎸夌収accsii鎺掑簭锛堝崌搴忥級
+ for (Object e : es) {
+ Map.Entry entry = (Map.Entry) e;
+ String k = (String) entry.getKey();
+ Object v = entry.getValue();
+ if (null != v && !"".equals(v) && !"sign".equals(k) && !"key".equals(k)) {
+ sb.append(k + "=" + v + "&");
+ }
}
+ sb.append("key=" + wxPayProperties.getMchKey());
+ System.out.println("瀛楃涓叉嫾鎺ュ悗鏄�:" + sb.toString());
+ return SecureUtil.md5(sb.toString()).toUpperCase();
+ }*/
+
+
+ /**
+ * 寰俊璁㈠崟鐘舵�佹煡璇�
+ * @param poleId
+ * @param outTradeNo
+ * @return
+ */
+ public boolean WxOrderQuery(Long poleId,String outTradeNo){
+ WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
+ if(wxConfig==null){
+ throw new BusinessException("鑾峰彇寰俊鏀粯閰嶇疆澶辫触");
}
- sb.append("key=" + wxPayProperties.getMchKey());
- System.out.println("瀛楃涓叉嫾鎺ュ悗鏄�:" + sb.toString());
- return SecureUtil.md5(sb.toString()).toUpperCase();
- }*/
+ String s = HttpUtil.get(WECHAT_ORDER_QUETY_URL + outTradeNo + WECHAT_ORDER_QUETY + wxConfig.getMchId());//WxOrderDto
+ WxOrderDto wxOrderDto = JSON.parseObject(s, WxOrderDto.class);
+ if(("SUCCESS").equals(wxOrderDto.getTrade_state())){
+ return true;
+ }
+
+ return false;
+ }
/**
* @param parameters
@@ -133,7 +164,7 @@
return sign;
}
- public WxPayOrderNotifyResult parseOrderNotifyResult(WxPayService wxPayService, String xmlData) {
+ public WxPayOrderNotifyResult parseOrderNotifyResult(String xmlData) {
try {
return wxPayService.parseOrderNotifyResult(xmlData);
} catch (WxPayException e) {
@@ -142,7 +173,7 @@
}
}
- public WxPayRefundNotifyResult parseRefundNotifyResult(WxPayService wxPayService, String xmlData) {
+ public WxPayRefundNotifyResult parseRefundNotifyResult( String xmlData) {
try {
return wxPayService.parseRefundNotifyResult(xmlData);
} catch (WxPayException e) {
@@ -160,7 +191,7 @@
* @param callbackUrl
* @return
*/
- public boolean refundOrder(WxPayService wxPayService, String orderId, String refundSn, Integer refundFee, String callbackUrl) {
+ public boolean refundOrder( String orderId, String refundSn, Integer refundFee, String callbackUrl) {
WxPayRefundRequest refundRequest = new WxPayRefundRequest();
refundRequest.setOutTradeNo(orderId);
refundRequest.setOutRefundNo(refundSn);
@@ -185,7 +216,7 @@
/**
* 鐢熸垚浜岀淮鐮佷粯娆�
*/
- public String generateQRCodePay(WxPayService wxPayService, String body,
+ public String generateQRCodePay( String body,
String orderId, int totalFee, String callbackUrl) {
WxPayUnifiedOrderRequest wxPayUnifiedOrderRequest = new WxPayUnifiedOrderRequest();
wxPayUnifiedOrderRequest.setBody(body);
--
Gitblit v1.9.3