From 4e76b9737e036c18e8a9e840dc443615ffcec348 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 20 十月 2022 12:20:18 +0800
Subject: [PATCH] 大气农耕
---
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wxpay/UsrWxPayConfigService.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wxpay/UsrWxPayConfigService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wxpay/UsrWxPayConfigService.java
index 87256fa..29f7391 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wxpay/UsrWxPayConfigService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wxpay/UsrWxPayConfigService.java
@@ -42,18 +42,32 @@
WxConfigEntity config;
//鏈缃敮浠樺弬鏁帮紝鍒欎娇鐢ㄩ粯璁ゆ敮浠樺弬鏁�
config = getOne(Wrappers.lambdaQuery(WxConfigEntity.class).eq(WxConfigEntity::getClientId, pole.getClientId()).eq(WxConfigEntity::getState, 1));
- if (pole.getClientId() == null) {
- config = getById(15); // todo 鏆傛椂鍐欐锛屽悗缁渶瑕佹敼鎴愰厤缃枃浠�
- }
+// if (pole.getClientId() == null) {
+ //娌℃湁褰掑睘鐨勭伅鏉嗕娇鐢ㄩ粯璁ら厤缃�
+// config = getById(15);
+// }
if (config == null) {
throw new BusinessException("鐢ㄦ埛鏈厤缃敮浠橀厤缃�,璇烽厤缃悗閲嶈瘯");
}
return config;
}
+ public WxConfigEntity getConfigByAppId(String appId) {
+ if (appId == null) {
+ throw new BusinessException("鍥炶皟澶辫触,鏈В鏋愬埌appid");
+ }
+ WxConfigEntity config;
+ //鏈缃敮浠樺弬鏁帮紝鍒欎娇鐢ㄩ粯璁ゆ敮浠樺弬鏁�
+ config = getOne(Wrappers.lambdaQuery(WxConfigEntity.class).eq(WxConfigEntity::getAppappid, appId).eq(WxConfigEntity::getState, 1));
- public static UsrWxPayConfigService getBean() {
- return (UsrWxPayConfigService) SpringContextUtil.getBean("UsrWxPayConfigService");
+ if (config == null) {
+ throw new BusinessException("鏈壘鍒版敮浠橀厤缃垨閰嶇疆鏈惎鐢�,璇疯仈绯荤鐞嗗憳!");
+ }
+// if (pole.getClientId() == null) {
+ //娌℃湁褰掑睘鐨勭伅鏉嗕娇鐢ㄩ粯璁ら厤缃�
+// config = getById(15);
+// }
+ return config;
}
@@ -63,12 +77,12 @@
config.setAppid(configParam.getAppId());
config.setAppappid(configParam.getAppAppId());
if (SecurityUtils.getClientId() != null) {
- config.setCreateUserId(SecurityUtils.getUserId());
if (clientService.findClientId()) {
config.setClientId(clientService.getClientId());
} else {
config.setClientId(SecurityUtils.getUserId());
}
+ config.setCreateUserId(SecurityUtils.getUserId());
} else {
config.setClientId(SecurityUtils.getUserId());
config.setCreateUserId(SecurityUtils.getUserId());
@@ -138,15 +152,16 @@
);
}
List<WxConfigEntity> list = list(wrapper);
- list.forEach(
- wxConfigEntity -> {
- //璁剧疆鏀粯鍙傛暟涓殑appid鍜宎ppappid mchId鍜宲rivateKey涓殑閮ㄥ垎鏇挎崲涓�*
- wxConfigEntity.setAppid(wxConfigEntity.getAppid().replaceAll("(?<=.{4}).*(?=.{4})", "*"));
- wxConfigEntity.setAppappid(wxConfigEntity.getAppappid().replaceAll("(?<=.{4}).*(?=.{4})", "*"));
- wxConfigEntity.setMchId(wxConfigEntity.getMchId().replaceAll("(?<=.{4}).*(?=.{4})", "*"));
- wxConfigEntity.setPrivateKey(wxConfigEntity.getPrivateKey().replaceAll("(?<=.{4}).*(?=.{4})", "*"));
- }
- );
+// list.forEach(
+// wxConfigEntity -> {
+// //璁剧疆鏀粯鍙傛暟涓殑appid鍜宎ppappid mchId鍜宲rivateKey涓殑閮ㄥ垎鏇挎崲涓�*
+// wxConfigEntity.setAppid(wxConfigEntity.getAppid().replaceAll("(?<=.{4}).*(?=.{4})", "*"));
+// wxConfigEntity.setAppappid(wxConfigEntity.getAppappid().replaceAll("(?<=.{4}).*(?=.{4})", "*"));
+// wxConfigEntity.setMchId(wxConfigEntity.getMchId().replaceAll("(?<=.{4}).*(?=.{4})", "*"));
+// wxConfigEntity.setPrivateKey(wxConfigEntity.getPrivateKey().replaceAll("(?<=.{4}).*(?=.{4})", "*"));
+// wxConfigEntity.setAppSecret(wxConfigEntity.getAppSecret().replaceAll("(?<=.{4}).*(?=.{4})", "*"));
+// }
+// );
return list;
}
--
Gitblit v1.9.3