From d9a9d8a2dad1d1e57b184bf8f972a03d654d883a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 22 七月 2022 15:07:01 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 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..698ae8e 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,6 +23,7 @@
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;
@@ -44,7 +48,6 @@
public static final String WECHAT_ORDER_QUETY = "?mchid=";
private final UsrWxPayConfigService wxPayConfigService;
-
/**
@@ -201,13 +204,13 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public SortedMap<Object, Object> miniAppPay(String body,
- String orderId, int totalFee, Long poleId) {
+ public SortedMap<Object, Object> miniAppPay(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,12 +218,13 @@
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);
@@ -259,4 +263,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