From afeba1406c1b5848c532b7c6dcec7f320d2a14f1 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 18 三月 2022 15:36:17 +0800
Subject: [PATCH] 微信支付配置相关

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/AliPayUtils.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/AliPayUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/AliPayUtils.java
index 6a98c18..cbb11d5 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/AliPayUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/AliPayUtils.java
@@ -10,7 +10,7 @@
 import com.google.gson.Gson;
 import com.sandu.ximon.admin.config.AlipayConfig;
 import com.sandu.ximon.admin.pay.alipay.UsrAlipayConfigService;
-import com.sandu.ximon.dao.domain.AlipayConfigEntity;
+import com.sandu.ximon.dao.domain.AliConfigEntity;
 import lombok.AllArgsConstructor;
 
 
@@ -23,16 +23,16 @@
 
 
     public static boolean alipayQuery(String out_trade_no, Long streetlightId) {
-        AlipayConfigEntity alipayConfigEntity = UsrAlipayConfigService.getBean().getConfigByPoleId(streetlightId);// 鑾峰彇瀹㈡埛鐨勬敮浠樺疂閰嶇疆
-        String checkStr = ConfigCheckUtils.checkAlipayConfig(alipayConfigEntity);
+        AliConfigEntity WxConfigEntity = UsrAlipayConfigService.getBean().getConfigByPoleId(streetlightId);// 鑾峰彇瀹㈡埛鐨勬敮浠樺疂閰嶇疆
+        String checkStr = ConfigCheckUtils.checkAlipayConfig(WxConfigEntity);
         if( checkStr != null){
             LogUtils.error("鏌ヨ澶辫触");
             return false;
         }
         //鑾峰緱鍒濆鍖栫殑AlipayClient
         AlipayClient alipayClient = new DefaultAlipayClient(AlipayConfig.gatewayUrl,
-                alipayConfigEntity.getAppId(), alipayConfigEntity.getPrivateKey(),
-                AlipayConfig.format, AlipayConfig.charset, alipayConfigEntity.
+                WxConfigEntity.getAppId(), WxConfigEntity.getPrivateKey(),
+                AlipayConfig.format, AlipayConfig.charset, WxConfigEntity.
                 getPublicKey(), AlipayConfig.sign_type);
 
         //璁剧疆璇锋眰鍙傛暟
@@ -84,16 +84,16 @@
         //鏍囪瘑涓�娆¢��娆捐姹傦紝鍚屼竴绗斾氦鏄撳娆¢��娆鹃渶瑕佷繚璇佸敮涓�锛屽闇�閮ㄥ垎閫�娆撅紝鍒欐鍙傛暟蹇呬紶銆�
         String  out_request_no = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
 
-        AlipayConfigEntity alipayConfigEntity = UsrAlipayConfigService.getBean().getConfigByPoleId(streetlightId);   //鎵惧埌鏄摢涓鎴风殑鍏呯數妗�  灏遍��娆剧粰璋�
-        String checkStr = ConfigCheckUtils.checkAlipayConfig(alipayConfigEntity);
+        AliConfigEntity WxConfigEntity = UsrAlipayConfigService.getBean().getConfigByPoleId(streetlightId);   //鎵惧埌鏄摢涓鎴风殑鍏呯數妗�  灏遍��娆剧粰璋�
+        String checkStr = ConfigCheckUtils.checkAlipayConfig(WxConfigEntity);
         if( checkStr != null){
             return false;
         }
 
         // SDK 鍏叡璇锋眰绫伙紝鍖呭惈鍏叡璇锋眰鍙傛暟锛屼互鍙婂皝瑁呬簡绛惧悕涓庨獙绛撅紝寮�鍙戣�呮棤闇�鍏虫敞绛惧悕涓庨獙绛�
-        AlipayClient client = new DefaultAlipayClient(AlipayConfig.gatewayUrl, alipayConfigEntity.getAppId(),
-                alipayConfigEntity.getPrivateKey(), AlipayConfig.format,
-                AlipayConfig.charset, alipayConfigEntity.getPublicKey(), AlipayConfig.sign_type);
+        AlipayClient client = new DefaultAlipayClient(AlipayConfig.gatewayUrl, WxConfigEntity.getAppId(),
+                WxConfigEntity.getPrivateKey(), AlipayConfig.format,
+                AlipayConfig.charset, WxConfigEntity.getPublicKey(), AlipayConfig.sign_type);
         AlipayTradeRefundRequest alipay_request = new AlipayTradeRefundRequest();
         AlipayTradeRefundModel model = new AlipayTradeRefundModel();
         model.setOutTradeNo(out_trade_no);

--
Gitblit v1.9.3