From e499e9113e3bcf942f631625ff9bee6fccb6924c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 18 八月 2021 01:08:20 +0800
Subject: [PATCH] 优化掉员工方法
---
service-front/src/main/java/com/java110/front/smo/staff/impl/StaffAuthSMOImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/staff/impl/StaffAuthSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/staff/impl/StaffAuthSMOImpl.java
old mode 100644
new mode 100755
index 70ab6c8..4d83c47
--- a/service-front/src/main/java/com/java110/front/smo/staff/impl/StaffAuthSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/staff/impl/StaffAuthSMOImpl.java
@@ -86,16 +86,26 @@
}
JSONObject paramObj = JSONObject.parseObject(paramOut.getBody());
-
//鑾峰彇 openId
String openId = paramObj.getString("openid");
+ url = WechatConstant.APP_GET_USER_INFO_URL
+ .replace("ACCESS_TOKEN", paramObj.getString("access_token"))
+ .replace("OPENID", openId);
+ paramOut = outRestTemplate.getForEntity(url, String.class);
+
+ logger.debug("璋冪敤寰俊鎹㈠幓openId ", paramOut);
+ if (paramOut.getStatusCode() != HttpStatus.OK) {
+ return ResultVo.redirectPage("/");
+ }
+ paramObj = JSONObject.parseObject(paramOut.getBody());
JSONObject paramAuth = new JSONObject();
paramAuth.put("openId", openId);
paramAuth.put("staffId", staffId);
paramAuth.put("storeId", storeId);
paramAuth.put("appType", "WECHAT");
paramAuth.put("state", "2002");
+ paramAuth.put("openName", paramObj.getString("nickname"));
ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, paramAuth.toJSONString(),
ServiceConstant.SERVICE_API_URL + "/api/staff/updateStaffAppAuth", HttpMethod.POST);
@@ -133,14 +143,16 @@
try {
openUrl = WechatConstant.OPEN_AUTH
.replace("APPID", smallWeChatDto.getAppId())
- .replace("SCOPE", "snsapi_base")
+ //.replace("SCOPE", "snsapi_base")
+ .replace("SCOPE", "snsapi_userinfo")
.replace(
"REDIRECT_URL",
URLEncoder
.encode(
(url
+ "/app/loginStaffWechatAuth?appId=992020061452450002&staffId="
- + staffId + "&storeId=" + storeId + "&wId=" + WechatFactory.getWId(smallWeChatDto.getAppId())),
+ + staffId + "&storeId=" + storeId + "&wId=" + WechatFactory.getWId(smallWeChatDto.getAppId()))
+ + "&communityId=" + communityId,
"UTF-8")).replace("STATE", "1");
response.sendRedirect(openUrl);
} catch (Exception e) {
@@ -180,7 +192,7 @@
pd.getAppId());
responseEntity = this.callCenterService(restTemplate, pd, "",
ServiceConstant.SERVICE_API_URL + "/api/smallWeChat.listSmallWeChats?communityId="
- + paramIn.getString("communityId") + "&page=1&row=1", HttpMethod.GET);
+ + paramIn.getString("communityId") + "&page=1&row=1&weChatType=" + SmallWeChatDto.WECHAT_TYPE_PUBLIC, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return null;
--
Gitblit v1.8.0