From a45ab2c9d4b5aa7e580067072d596065f95726ea Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 01 七月 2022 09:48:38 +0800
Subject: [PATCH] 充电桩

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java |   16 ++++------------
 1 files changed, 4 insertions(+), 12 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 c5bca8b..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
@@ -210,16 +210,13 @@
         //璁剧疆寰俊鏀粯鍙傛暟
         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));
         payConfig.setSubMchId(StringUtils.trimToNull(null));
         payConfig.setKeyPath(StringUtils.trimToNull(null));
         wxPayService.setConfig(payConfig);
-
-
-
 
 
         //璁剧疆寰俊鍚屼竴璁㈠崟璇锋眰
@@ -272,7 +269,7 @@
             throw new BusinessException("鎵句笉鍒板井淇¢厤缃�");
         }
         WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
-        config.setAppid(wxConfig.getAppid());
+        config.setAppid(wxConfig.getAppappid());
         config.setSecret(wxConfig.getAppSecret());
         WxMaService service = new WxMaServiceImpl();
         service.setWxMaConfig(config);
@@ -281,15 +278,10 @@
 
     public String getOpenId(Long poleId, String wxCode) throws WxErrorException {
         WxConfigEntity userConfig = wxPayConfigService.getConfigByPoleId(poleId);
-        WxConfigEntity wxConfig = new WxConfigEntity();
-        wxConfig.setAppid(userConfig.getAppid());
-        wxConfig.setMchId(userConfig.getMchId());
-        wxConfig.setPrivateKey(userConfig.getPrivateKey());
-        wxConfig.setAppSecret(userConfig.getAppSecret());
-        if (wxConfig == null) {
+        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