From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java | 110 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 88 insertions(+), 22 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 eedfb8c..27346f7 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
@@ -1,7 +1,9 @@
package com.sandu.ximon.admin.pay.wx;
+import cn.dreampie.encription.EncriptionKit;
import cn.hutool.core.codec.Base64;
-import cn.hutool.crypto.SecureUtil;
+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,8 @@
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.YSY_AccessTokenDto;
+import com.sandu.ximon.admin.dto.wxquery.WxOrderDto;
import com.sandu.ximon.admin.pay.wxpay.UsrWxPayConfigService;
import com.sandu.ximon.dao.domain.WxConfigEntity;
import lombok.AllArgsConstructor;
@@ -34,46 +38,66 @@
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 openId
* @param body 鍟嗗搧鎻忚堪
- * @param orderId 璁㈠崟id
+ * @param
* @param totalFee 鏀粯閲戦锛堝垎锛�
* @return
*/
- public SortedMap<Object, Object> miniAppPay(WxPayService wxPayService, String openId, String body,
- String orderId, int totalFee, String callbackUrl) {
+ 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);
- wxPayUnifiedOrderRequest.setOutTradeNo(orderId);
+ wxPayUnifiedOrderRequest.setOutTradeNo(orderSn);
wxPayUnifiedOrderRequest.setTotalFee(totalFee);
- wxPayUnifiedOrderRequest.setOpenid(openId);
- wxPayUnifiedOrderRequest.setSignType(WxPayConstants.SignType.MD5);
+ //wxPayUnifiedOrderRequest.setSignType(WxPayConstants.SignType.MD5);
wxPayUnifiedOrderRequest.setSpbillCreateIp(IpUtil.getRealIp());
- wxPayUnifiedOrderRequest.setNotifyUrl(callbackUrl);
- wxPayUnifiedOrderRequest.setTradeType(WxPayConstants.TradeType.JSAPI);
+ wxPayUnifiedOrderRequest.setNotifyUrl(WECHAT_ORDER_PAY_CALLBACK_URL);
+ wxPayUnifiedOrderRequest.setTradeType(WxPayConstants.TradeType.APP);
try {
WxPayUnifiedOrderResult wxPayUnifiedOrderResult = wxPayService.unifiedOrder(wxPayUnifiedOrderRequest);
String time = String.valueOf(System.currentTimeMillis() / 1000);
if (WxPayConstants.ResultCode.SUCCESS.equals(wxPayUnifiedOrderResult.getResultCode())) {
- SortedMap<Object, Object> hashMap = new TreeMap<>();
- hashMap.put("appId", wxPayUnifiedOrderResult.getAppid());
+ SortedMap<Object, Object> parameters = new TreeMap<>();
+ /*hashMap.put("appId", wxPayUnifiedOrderResult.getAppid());
hashMap.put("nonceStr", wxPayUnifiedOrderResult.getNonceStr());
- hashMap.put("package", "prepay_id=" + wxPayUnifiedOrderResult.getPrepayId());
+ hashMap.put("prepayId", wxPayUnifiedOrderResult.getPrepayId());
+ // hashMap.put("package", "prepay_id=" + wxPayUnifiedOrderResult.getPrepayId());
hashMap.put("signType", WxPayConstants.SignType.MD5);
hashMap.put("timeStamp", time);
- String wechatSign = createSign(wxPayService.getConfig().getMchKey(), hashMap);
- hashMap.put("paySign", wechatSign);
- return hashMap;
+ hashMap.put("partnerid", wxPayProperties.getMchId());*/
+ parameters.put("appid", wxPayUnifiedOrderResult.getAppid());
+
+ parameters.put("noncestr", wxPayUnifiedOrderResult.getNonceStr()); // 闅忔満瀛楃涓�
+ parameters.put("partnerid", wxConfig.getMchId()); // 鍟嗘埛id
+
+ // parameters.put("out_trade_no", orderId);//鍟嗘埛璁㈠崟鍙�
+ parameters.put("prepayid", wxPayUnifiedOrderResult.getPrepayId());
+ parameters.put("package", "Sign=WXPay");
+ parameters.put("timestamp", time);
+
+ String sign = createSign(parameters, wxConfig.getPrivateKey());
+
+ //hashMap.put("paySign", wechatSign);
+ parameters.put("Sign", sign);
+ return parameters;
} else {
log.error("寰俊鏀粯澶辫触锛寋}", wxPayUnifiedOrderResult.getErrCodeDes());
- throw new BusinessException("寰俊鏀粯澶辫触锛�" + wxPayUnifiedOrderResult);
+ throw new BusinessException("寰俊鏀粯澶辫触锛�" + wxPayUnifiedOrderResult.getErrCodeDes());
}
} catch (WxPayException e) {
log.error("寰俊鏀粯澶辫触锛寋}", e.getErrCodeDes());
@@ -81,20 +105,61 @@
}
}
- private String createSign(String mchKey, SortedMap<Object, Object> parameters) {
+ /* 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
+ */
+ private Object WxOrderQuery(Long poleId,String outTradeNo){
+ WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
+ if(wxConfig==null){
+ throw new BusinessException("鑾峰彇寰俊鏀粯閰嶇疆澶辫触");
+ }
+ String s = HttpUtil.get(WECHAT_ORDER_QUETY_URL + outTradeNo + WECHAT_ORDER_QUETY + wxConfig.getMchId());//WxOrderDto
+ WxOrderDto wxOrderDto = JSON.parseObject(s, WxOrderDto.class);
+
+ return wxOrderDto.getTrade_state();
+ }
+
+ /**
+ * @param parameters
+ * @return
+ */
+ @SuppressWarnings("rawtypes")
+ private String createSign(SortedMap<Object, Object> parameters, String Key) {
StringBuffer sb = new StringBuffer();
Set es = parameters.entrySet();// 鎵�鏈夊弬涓庝紶鍙傜殑鍙傛暟鎸夌収accsii鎺掑簭锛堝崌搴忥級
- for (Object e : es) {
- Map.Entry entry = (Map.Entry) e;
+ Iterator it = es.iterator();
+ while (it.hasNext()) {
+ Map.Entry entry = (Map.Entry) it.next();
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=" + mchKey);
+ sb.append("key=" + Key);
System.out.println("瀛楃涓叉嫾鎺ュ悗鏄�:" + sb.toString());
- return SecureUtil.md5(sb.toString()).toUpperCase();
+ String sign = EncriptionKit.encrypt(sb.toString()).toUpperCase();
+ return sign;
}
public WxPayOrderNotifyResult parseOrderNotifyResult(WxPayService wxPayService, String xmlData) {
@@ -180,6 +245,7 @@
/**
* 閫�娆�
+ *
* @param totalAmount
* @param refundAmount
* @param outTradeNo
--
Gitblit v1.9.3