From 52a3bda95de2e73e5958644f57b2a3d32168a4a1 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 22 八月 2022 16:04:26 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 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 e0d9746..c5fd3c4 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,10 @@
package com.sandu.ximon.admin.pay.wx;
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
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;
@@ -20,10 +23,12 @@
import com.sandu.ximon.dao.domain.WxConfigEntity;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletRequest;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -44,7 +49,6 @@
public static final String WECHAT_ORDER_QUETY = "?mchid=";
private final UsrWxPayConfigService wxPayConfigService;
-
/**
@@ -201,13 +205,13 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public SortedMap<Object, Object> miniAppPay(String body,
- String orderId, int totalFee, Long poleId) {
+ public SortedMap<Object, Object> miniAppPay(HttpServletRequest request, String body, String orderId, int totalFee, Long poleId, String wxCode) throws WxErrorException {
WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
- wxConfig.setMchId(wxConfig.getMchId().trim());
+
//璁剧疆寰俊鏀粯鍙傛暟
WxPayConfig payConfig = new WxPayConfig();
- payConfig.setAppId(StringUtils.trimToNull(wxConfig.getAppid()));
+
+ payConfig.setAppId(StringUtils.trimToNull(wxConfig.getAppappid()));
payConfig.setMchId(StringUtils.trimToNull(wxConfig.getMchId()));
payConfig.setMchKey(StringUtils.trimToNull(wxConfig.getPrivateKey()));
payConfig.setSubAppId(StringUtils.trimToNull(null));
@@ -215,16 +219,17 @@
payConfig.setKeyPath(StringUtils.trimToNull(null));
wxPayService.setConfig(payConfig);
+
//璁剧疆寰俊鍚屼竴璁㈠崟璇锋眰
WxPayUnifiedOrderRequest wxPayUnifiedOrderRequest = new WxPayUnifiedOrderRequest();
wxPayUnifiedOrderRequest.setBody(body);
wxPayUnifiedOrderRequest.setOutTradeNo(orderId);
wxPayUnifiedOrderRequest.setTotalFee(totalFee);
-// wxPayUnifiedOrderRequest.setOpenid("otiM54x_hc_5gbhMY5aZxo7UByNo");
+ wxPayUnifiedOrderRequest.setOpenid(wxCode);
wxPayUnifiedOrderRequest.setSignType(WxPayConstants.SignType.MD5);
- wxPayUnifiedOrderRequest.setSpbillCreateIp(IpUtil.getRealIp());
+ wxPayUnifiedOrderRequest.setSpbillCreateIp(IpUtil.getIpAddr(request));
wxPayUnifiedOrderRequest.setNotifyUrl(WECHAT_ORDER_PAY_CALLBACK_URL);
wxPayUnifiedOrderRequest.setTradeType(WxPayConstants.TradeType.JSAPI);
System.out.println("-----------" + wxPayUnifiedOrderRequest);
@@ -236,13 +241,13 @@
SortedMap<Object, Object> parameters = new TreeMap<>();
parameters.put("appid", wxPayUnifiedOrderResult.getAppid());
- parameters.put("noncestr", wxPayUnifiedOrderResult.getNonceStr()); // 闅忔満瀛楃涓�
+// 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);
+// parameters.put("package", "Sign=WXPay");
+// parameters.put("timestamp", time);
String sign = createSign(wxConfig.getPrivateKey(), parameters);
@@ -259,4 +264,26 @@
}
}
+
+ public WxMaService getWxMaService(WxConfigEntity wxConfig) {
+ if (wxConfig == null) {
+ throw new BusinessException("鎵句笉鍒板井淇￠厤缃�");
+ }
+ WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+ config.setAppid(wxConfig.getAppappid());
+ config.setSecret(wxConfig.getAppSecret());
+ WxMaService service = new WxMaServiceImpl();
+ service.setWxMaConfig(config);
+ return service;
+ }
+
+ public String getOpenId(Long poleId, String wxCode) throws WxErrorException {
+ WxConfigEntity userConfig = wxPayConfigService.getConfigByPoleId(poleId);
+ if (userConfig == null) {
+ throw new BusinessException("鎵句笉鍒板井淇￠厤缃�");
+ }
+ WxMaJscode2SessionResult sessionInfo = this.getWxMaService(userConfig).getUserService().getSessionInfo(wxCode);
+ return sessionInfo.getOpenid();
+ }
+
}
--
Gitblit v1.9.3