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 | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 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 d762e90..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
@@ -205,24 +205,18 @@
*/
@Transactional(rollbackFor = Exception.class)
public SortedMap<Object, Object> miniAppPay(String body, String orderId, int totalFee, Long poleId, String wxCode) throws WxErrorException {
-// WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
- WxConfigEntity wxConfig = new WxConfigEntity();
- wxConfig.setAppid("wx3d7b3ba37fee07de");
- wxConfig.setMchId("1536603671");
- wxConfig.setPrivateKey("0yec5jkwqy4muv5313yn520rdq5cfmqu");
-// wxConfig.setMchId(wxConfig.getMchId().trim());
+ WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
+
//璁剧疆寰俊鏀粯鍙傛暟
WxPayConfig payConfig = new WxPayConfig();
- payConfig.setAppId(StringUtils.trimToNull("wx3d7b3ba37fee07de"));
- payConfig.setMchId(StringUtils.trimToNull("1536603671"));
- payConfig.setMchKey(StringUtils.trimToNull("0yec5jkwqy4muv5313yn520rdq5cfmqu"));
+
+ payConfig.setAppId(StringUtils.trimToNull(wxConfig.getAppappid()));
+ payConfig.setMchId(StringUtils.trimToNull(wxConfig.getMchId()));
+ payConfig.setMchKey(StringUtils.trimToNull(wxConfig.getPrivateKey()));
payConfig.setSubAppId(StringUtils.trimToNull(null));
payConfig.setSubMchId(StringUtils.trimToNull(null));
payConfig.setKeyPath(StringUtils.trimToNull(null));
wxPayService.setConfig(payConfig);
-
-
-
//璁剧疆寰俊鍚屼竴璁㈠崟璇锋眰
@@ -275,23 +269,19 @@
throw new BusinessException("鎵句笉鍒板井淇￠厤缃�");
}
WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
- config.setAppid(wxConfig.getAppid());
- config.setSecret("05edea692eb1b70670ec9ac6e9c62a84");
+ 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 wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
- WxConfigEntity wxConfig = new WxConfigEntity();
- wxConfig.setAppid("wx3d7b3ba37fee07de");
- wxConfig.setMchId("1536603671");
- wxConfig.setPrivateKey("0yec5jkwqy4muv5313yn520rdq5cfmqu");
- if (wxConfig == null) {
+ WxConfigEntity userConfig = wxPayConfigService.getConfigByPoleId(poleId);
+ if (userConfig == null) {
throw new BusinessException("鎵句笉鍒板井淇￠厤缃�");
}
- WxMaJscode2SessionResult sessionInfo = this.getWxMaService(wxConfig).getUserService().getSessionInfo(wxCode);
+ WxMaJscode2SessionResult sessionInfo = this.getWxMaService(userConfig).getUserService().getSessionInfo(wxCode);
return sessionInfo.getOpenid();
}
--
Gitblit v1.9.3