From c6c8d6c03c3ac7e918eb17ebcba0c1472f2dd7ec Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Nov 2021 11:28:17 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java
index 5befb86..8940122 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java
@@ -45,9 +45,12 @@
* @param code
* @return
*/
- public String getXcxLoginUrl(String code,Long companyId) {
+ public String getXcxLoginUrl(String code,Long companyId, String type) {
String wechatLoginUrl = PropertiesUtil.getString(WECHAT_LOGIN_URL);
- return String.format(wechatLoginUrl, getAppid(companyId), getSecret(companyId), code);
+ if (AppConstance.MINIPROGRAM_APPID.equals(type)) {
+ return String.format(wechatLoginUrl, getAppid(companyId), getSecret(companyId), code);
+ } else {
+ return String.format(wechatLoginUrl, getManagerAppId(companyId), getManagerSecret(companyId), code); }
}
/**
@@ -68,6 +71,17 @@
return secret.getParamValue();
}
+ public String getManagerAppId(Long companyId) {
+ BusParameterSettings appId = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.MINI_PROGRAM_MANAGER_APP_ID, companyId);
+ return appId.getParamValue();
+ }
+
+ public String getManagerSecret(Long companyId){
+ BusParameterSettings secret = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.MINI_PROGRAM_MANAGER_SECRET, companyId);
+ return secret.getParamValue();
+ }
+
+
/**
--
Gitblit v1.9.1