Merge remote-tracking branch 'origin/master'

emall-core/src/main/java/com/emall/flash/bean/vo/UserInfo.java

@@ -27,6 +27,7 @@ public class UserInfo {
     private Boolean refreshWechatInfo = true;
     //上次登录商圈id
     private Long tenantId;
+    private String tenantName;
     public String getNickName() {
         return StringUtil.isEmpty(nickName)?wechatNickName:nickName;
     }

emall-mobile-api/src/main/java/com/emall/flash/mobile/controller/WeChatController.java

@@ -11,6 +11,7 @@ import com.emall.flash.cache.CacheDao;
 import com.emall.flash.security.UserService;
 import com.emall.flash.service.api.WeixinService;
 import com.emall.flash.service.shop.ShopUserService;
+import com.emall.flash.service.shop.TenantService;
 import com.emall.flash.service.system.CfgService;
 import com.emall.flash.utils.Maps;
 import com.emall.flash.utils.RandomUtil;
@@ -44,6 +45,8 @@ public class WeChatController extends BaseController {
     private CacheDao cacheDao;
     @Autowired
     private CfgService cfgService;
+    @Autowired
+    private TenantService tenantService;
 
     @RequestMapping(value = "getWxOpenId", method = RequestMethod.POST)
     public Object getWxOpenId(String code, HttpServletRequest request) {
@@ -112,6 +115,8 @@ public class WeChatController extends BaseController {
         shopUserService.update(shopUser);
         UserInfo userInfo = new UserInfo();
         BeanUtils.copyProperties(shopUser, userInfo);
+        if (userInfo.getTenantId() != null)
+            userInfo.setTenantName(tenantService.get(userInfo.getTenantId()).getName());
         userInfo.setRefreshWechatInfo(false);
         Map result = Maps.newHashMap(
                 "user", userInfo,