Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java
#	src/main/java/cn/quantgroup/xyqb/service/user/IAddressService.java
#	src/main/java/cn/quantgroup/xyqb/service/user/impl/AddressServiceImpl.java

src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java

@@ -220,6 +220,59 @@ public class WeChatController {
         response.setStatus(301);
     }
 
+    /**
+     * 通过redirect_url获取code
+     *
+     * @param response
+     * @return
+     */
+    @RequestMapping("/receiveCode/{key}")
+    public void receiveCodeNoRedirect(String code, @PathVariable(value = "key") String systemKey, HttpServletResponse response) {
+        LOGGER.info("微信登录:key{}", systemKey);
+        // 从code获取token
+        Merchant merchant = merchantService.findMerchantByName(systemKey);
+
+        AccessTokenResponse token = wechatService.getToken(code);
+        if (token == null) {
+            // 让用户登录，不关联微信, 构造不关联微信的url
+            redirectNormalUrl(response, merchant);
+            return;
+        }
+        WechatUserInfo userInfo = wechatService.getWechatUserInfoFromWechatServer(token.getAccessToken(), token.getOpenId());
+        if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) {
+            // 让用户登录，不关联微信, 构造不关联微信的url
+            redirectNormalUrl(response, merchant);
+            return;
+        }
+        WechatUserInfo userInfoInDb = wechatService.findWechatUserInfoFromDb(userInfo.getOpenId());
+        // welcome 首次登录
+        if (userInfoInDb == null) {
+            // 微信用户首次登录界面, 首先保存userInfo, 跳入到微信注册登录界面
+            if(StringUtils.isNotBlank(userInfo.getNickName())) {
+                String nickName = EmojiUtil.filter(userInfo.getNickName());
+                userInfo.setNickName(nickName);
+            }
+            userInfo = wechatService.saveWechatUserInfo(userInfo);
+            redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo);
+            return;
+        }
+        if (userInfoInDb.getUserId() == null) {
+            // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
+            redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb);
+            return;
+        }
+        User user = userService.findById(userInfoInDb.getUserId());
+        if (user == null) {
+            redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb);
+            return;
+        }
+        // 已经关联了用户
+        // create session, 登进去，该怎么玩怎么玩。
+        String redirectUrl = createUserSession(user, merchant, "");
+        response.setHeader("Location", redirectUrl);
+        response.setStatus(301);
+    }
+
     private String createUserSession(User user, Merchant merchant, String redirect) {
         if(StringUtils.isEmpty(redirect) || "redirect".equals(redirect)) {
             LOGGER.info("微信登录:redirect为null,走正常流程.");
@@ -228,7 +281,7 @@ public class WeChatController {
             } else {
                 return loginInWechatWithSessionCreated(user, merchant, "cashTarget4", 1L);
             }
-        } else if(redirect.equals("local")){
+        } else if("local".equals(redirect)){
             LOGGER.info("微信登录:redirect不为null,创建session跳到指定前端页面.");
             AuthBean authBean = sessionService.createSession(Constants.Channel.WECHAT, Constants.Channel.WECHAT, "", user, merchant);
             LOGGER.info("微信登录:跳转地址{}", userUIAddr + "/weixin/callback?phoneNo=" + user.getPhoneNo() + "&token=" + authBean.getToken());