From eee37d696c4b5e1b2d1117e781e93eadc3c3fbe7 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 27 六月 2022 18:15:25 +0800
Subject: [PATCH] 支付配置
---
ximon-admin/src/main/resources/application.yml | 5 --
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxPayConfiguration.java | 54 +++++++++++++-------------
3 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
index 7260cfe..5b4fbc9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
@@ -86,7 +86,7 @@
param.setOutTradeNo(c3mOrderEntity.getOutTradeNo());
param.setTotalAmount(c3mOrderEntity.getTotalAmount());
String s = WxFastPayService.parseWxAmount(param.getTotalAmount().toString());
- SortedMap<Object, Object> result = wxPayService.miniAppPay("鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", param.getOutTradeNo(),Integer.valueOf(s) , param.getPoleId());
+ SortedMap<Object, Object> result = wxPayService.miniAppPay("鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", param.getOutTradeNo(), Integer.valueOf(s), param.getPoleId());
return ResponseUtil.success(result);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxPayConfiguration.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxPayConfiguration.java
index bead943..5c372dc 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxPayConfiguration.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxPayConfiguration.java
@@ -14,30 +14,30 @@
/**
* @author Binary Wang
*/
-@Configuration
-@ConditionalOnClass(WxPayService.class)
-@EnableConfigurationProperties(WxPayProperties.class)
-@AllArgsConstructor
-public class WxPayConfiguration {
- private WxPayProperties properties;
-
- @Bean
- @ConditionalOnMissingBean
- public WxPayService wxService() {
- WxPayConfig payConfig = new WxPayConfig();
- payConfig.setAppId(StringUtils.trimToNull(this.properties.getAppId()));
- payConfig.setMchId(StringUtils.trimToNull(this.properties.getMchId()));
- payConfig.setMchKey(StringUtils.trimToNull(this.properties.getMchKey()));
- payConfig.setSubAppId(StringUtils.trimToNull(this.properties.getSubAppId()));
- payConfig.setSubMchId(StringUtils.trimToNull(this.properties.getSubMchId()));
- payConfig.setKeyPath(StringUtils.trimToNull(this.properties.getKeyPath()));
-
- // 鍙互鎸囧畾鏄惁浣跨敤娌欑鐜
- payConfig.setUseSandboxEnv(false);
-
- WxPayService wxPayService = new WxPayServiceImpl();
- wxPayService.setConfig(payConfig);
- return wxPayService;
- }
-
-}
+//@Configuration
+//@ConditionalOnClass(WxPayService.class)
+//@EnableConfigurationProperties(WxPayProperties.class)
+//@AllArgsConstructor
+//public class WxPayConfiguration {
+// private WxPayProperties properties;
+//
+// @Bean
+// @ConditionalOnMissingBean
+// public WxPayService wxService() {
+// WxPayConfig payConfig = new WxPayConfig();
+// payConfig.setAppId(StringUtils.trimToNull(this.properties.getAppId()));
+// payConfig.setMchId(StringUtils.trimToNull(this.properties.getMchId()));
+// payConfig.setMchKey(StringUtils.trimToNull(this.properties.getMchKey()));
+// payConfig.setSubAppId(StringUtils.trimToNull(this.properties.getSubAppId()));
+// payConfig.setSubMchId(StringUtils.trimToNull(this.properties.getSubMchId()));
+// payConfig.setKeyPath(StringUtils.trimToNull(this.properties.getKeyPath()));
+//
+// // 鍙互鎸囧畾鏄惁浣跨敤娌欑鐜
+// payConfig.setUseSandboxEnv(false);
+//
+// WxPayService wxPayService = new WxPayServiceImpl();
+// wxPayService.setConfig(payConfig);
+// return wxPayService;
+// }
+//
+//}
diff --git a/ximon-admin/src/main/resources/application.yml b/ximon-admin/src/main/resources/application.yml
index 3a751a3..4d2b7b1 100644
--- a/ximon-admin/src/main/resources/application.yml
+++ b/ximon-admin/src/main/resources/application.yml
@@ -22,11 +22,6 @@
logging:
file:
path: logs
-wx:
- pay:
- appId: dsd #寰俊鍏紬鍙锋垨鑰呭皬绋嬪簭绛夌殑appid
- mchId: dsdsd #寰俊鏀粯鍟嗘埛鍙�
- mchKey: dsd #寰俊鏀粯鍟嗘埛瀵嗛挜
# led灞忓箷鏈嶅姟鍣ㄥ湴鍧�锛堟洿鏀归渶瑕佸悓鏃舵洿鏀癸級
--
Gitblit v1.9.3