From c90e9e6d615b94aec96969b59d1eaecffaf8d0ef Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 28 六月 2022 18:07:50 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java | 138 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 105 insertions(+), 33 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..22975ae 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;
@@ -10,14 +12,15 @@
import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult;
import com.github.binarywang.wxpay.constant.WxPayConstants;
import com.github.binarywang.wxpay.exception.WxPayException;
-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;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
@@ -33,42 +36,42 @@
public class WxFastPayService {
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_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);
+ wxConfig.setMchId(wxConfig.getMchId().trim());
WxPayUnifiedOrderRequest wxPayUnifiedOrderRequest = new WxPayUnifiedOrderRequest();
wxPayUnifiedOrderRequest.setBody(body);
wxPayUnifiedOrderRequest.setOutTradeNo(orderSn);
wxPayUnifiedOrderRequest.setTotalFee(totalFee);
+ wxPayUnifiedOrderRequest.setOpenid("otiM54x_hc_5gbhMY5aZxo7UByNo");
- //wxPayUnifiedOrderRequest.setSignType(WxPayConstants.SignType.MD5);
+ wxPayUnifiedOrderRequest.setSignType(WxPayConstants.SignType.MD5);
wxPayUnifiedOrderRequest.setSpbillCreateIp(IpUtil.getRealIp());
wxPayUnifiedOrderRequest.setNotifyUrl(WECHAT_ORDER_PAY_CALLBACK_URL);
- wxPayUnifiedOrderRequest.setTradeType(WxPayConstants.TradeType.APP);
+ wxPayUnifiedOrderRequest.setTradeType(WxPayConstants.TradeType.JSAPI);
try {
WxPayUnifiedOrderResult wxPayUnifiedOrderResult = wxPayService.unifiedOrder(wxPayUnifiedOrderRequest);
+ System.out.println("********************************");
String time = String.valueOf(System.currentTimeMillis() / 1000);
if (WxPayConstants.ResultCode.SUCCESS.equals(wxPayUnifiedOrderResult.getResultCode())) {
SortedMap<Object, Object> parameters = new TreeMap<>();
- /*hashMap.put("appId", wxPayUnifiedOrderResult.getAppid());
- hashMap.put("nonceStr", wxPayUnifiedOrderResult.getNonceStr());
- hashMap.put("prepayId", wxPayUnifiedOrderResult.getPrepayId());
- // hashMap.put("package", "prepay_id=" + wxPayUnifiedOrderResult.getPrepayId());
- hashMap.put("signType", WxPayConstants.SignType.MD5);
- hashMap.put("timeStamp", time);
- hashMap.put("partnerid", wxPayProperties.getMchId());*/
parameters.put("appid", wxPayUnifiedOrderResult.getAppid());
parameters.put("noncestr", wxPayUnifiedOrderResult.getNonceStr()); // 闅忔満瀛楃涓�
@@ -79,7 +82,7 @@
parameters.put("package", "Sign=WXPay");
parameters.put("timestamp", time);
- String sign = createSign(parameters, wxConfig.getPrivateKey());
+ String sign = createSign(wxConfig.getPrivateKey(), parameters);
//hashMap.put("paySign", wechatSign);
parameters.put("Sign", sign);
@@ -94,28 +97,50 @@
}
}
-/* 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
* @return
*/
@SuppressWarnings("rawtypes")
- private String createSign(SortedMap<Object, Object> parameters, String Key) {
+ private String createSign(String Key, SortedMap<Object, Object> parameters) {
StringBuffer sb = new StringBuffer();
Set es = parameters.entrySet();// 鎵�鏈夊弬涓庝紶鍙傜殑鍙傛暟鎸夌収accsii鎺掑簭锛堝崌搴忥級
Iterator it = es.iterator();
@@ -133,7 +158,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 +167,7 @@
}
}
- public WxPayRefundNotifyResult parseRefundNotifyResult(WxPayService wxPayService, String xmlData) {
+ public WxPayRefundNotifyResult parseRefundNotifyResult(String xmlData) {
try {
return wxPayService.parseRefundNotifyResult(xmlData);
} catch (WxPayException e) {
@@ -154,13 +179,12 @@
/**
* 璁㈠崟閫�娆� 鍙兘閫�娆句竴娆�
*
- * @param wxPayService
* @param orderId
* @param refundFee
* @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 +209,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);
@@ -261,4 +285,52 @@
return amount;
}
+
+ @Transactional(rollbackFor = Exception.class)
+ public SortedMap<Object, Object> miniAppPay(String body,
+ String orderId, int totalFee, Long poleId) {
+ WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
+ wxConfig.setMchId(wxConfig.getMchId().trim());
+ WxPayUnifiedOrderRequest wxPayUnifiedOrderRequest = new WxPayUnifiedOrderRequest();
+ wxPayUnifiedOrderRequest.setBody(body);
+ wxPayUnifiedOrderRequest.setOutTradeNo(orderId);
+ wxPayUnifiedOrderRequest.setTotalFee(totalFee);
+ wxPayUnifiedOrderRequest.setOpenid("otiM54x_hc_5gbhMY5aZxo7UByNo");
+
+
+ wxPayUnifiedOrderRequest.setSignType(WxPayConstants.SignType.MD5);
+ wxPayUnifiedOrderRequest.setSpbillCreateIp(IpUtil.getRealIp());
+ wxPayUnifiedOrderRequest.setNotifyUrl(WECHAT_ORDER_PAY_CALLBACK_URL);
+ wxPayUnifiedOrderRequest.setTradeType(WxPayConstants.TradeType.JSAPI);
+ System.out.println("-----------"+wxPayUnifiedOrderRequest);
+ try {
+ WxPayUnifiedOrderResult wxPayUnifiedOrderResult = wxPayService.unifiedOrder(wxPayUnifiedOrderRequest);
+ String time = String.valueOf(System.currentTimeMillis() / 1000);
+ if (WxPayConstants.ResultCode.SUCCESS.equals(wxPayUnifiedOrderResult.getResultCode())) {
+ SortedMap<Object, Object> parameters = new TreeMap<>();
+ 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(wxConfig.getPrivateKey(), parameters);
+
+ //hashMap.put("paySign", wechatSign);
+ parameters.put("Sign", sign);
+ return parameters;
+ } else {
+ log.error("寰俊鏀粯澶辫触锛寋}", wxPayUnifiedOrderResult.getErrCodeDes());
+ throw new BusinessException("寰俊鏀粯澶辫触锛�" + wxPayUnifiedOrderResult);
+ }
+ } catch (WxPayException e) {
+ log.error("寰俊鏀粯澶辫触锛寋}", e.getErrCodeDes());
+ throw new BusinessException("寰俊鏀粯澶辫触锛�" + e.getErrCodeDes());
+ }
+ }
+
}
--
Gitblit v1.9.3