From 43a1fc4eea2bd2618a0f51097f8a0d8eef5b306d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 12 十二月 2020 11:07:51 +0800
Subject: [PATCH] 加入小区ID

---
 service-front/src/main/java/com/java110/front/smo/staff/impl/StaffAuthSMOImpl.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 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
index 70ab6c8..c0c2d06 100644
--- 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) {

--
Gitblit v1.8.0