From 923c9cec3403ae2abcc523ea73918f243977e546 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 23 八月 2022 11:28:56 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wxpay/UsrWxPayConfigService.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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..59c70b7 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,12 +42,31 @@
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));
+
+ if (config == null) {
+ throw new BusinessException("鏈壘鍒版敮浠橀厤缃垨閰嶇疆鏈惎鐢�,璇疯仈绯荤鐞嗗憳!");
+ }
+// if (pole.getClientId() == null) {
+ //娌℃湁褰掑睘鐨勭伅鏉嗕娇鐢ㄩ粯璁ら厤缃�
+// config = getById(15);
+// }
return config;
}
@@ -63,12 +82,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());
@@ -145,6 +164,7 @@
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