From 376f3bd4f72a68f06e69d864038de1749c9d5865 Mon Sep 17 00:00:00 2001 From: yuyang Date: Wed, 2 Mar 2022 11:44:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/XhpcAppUserServiceImpl.java | 99 ++++++++++--------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java index a2f631c8..4554a763 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java @@ -430,56 +430,59 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU */ @Override public AjaxResult appInfo(HttpServletRequest request) { - LoginUser loginUser = logUserUtils.getLogUser(request); - Object version = redisService.getCacheObject("global:version"); - Object servicePhone = redisService.getCacheObject("global:phone"); - //根据不同的用户类型查询不同的信息 - Long userid = loginUser.getUserid(); - Integer userType = loginUser.getUserType(); - R user = userTypeService.getUser(null, loginUser.getUserid(), loginUser.getUserType(), null,loginUser.getTenantId()); - if(user !=null && user.getData() !=null){ - Map map = (Map)user.getData(); - //发票、留言板、版本、客服电话 - Integer invoice =null; - if(UserTypeUtil.USER_TYPE.equals(userType)){ - invoice = redisService.getCacheObject("global:invoice:" + UserTypeUtil.USER + userid); - }else if(UserTypeUtil.INTERNET_TYPE.equals(userType)){ - invoice = redisService.getCacheObject("global:invoice:"+UserTypeUtil.INTERNET+userid); - }else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){ - invoice = redisService.getCacheObject("global:invoice:"+UserTypeUtil.COMMUNIT+userid); + try{ + LoginUser loginUser = logUserUtils.getLogUser(request); + Object version = redisService.getCacheObject("global:version"); + Object servicePhone = redisService.getCacheObject("global:phone"); + //根据不同的用户类型查询不同的信息 + Long userid = loginUser.getUserid(); + Integer userType = loginUser.getUserType(); + R user = userTypeService.getUser(null, loginUser.getUserid(), loginUser.getUserType(), null,loginUser.getTenantId()); + if(user !=null && user.getData() !=null){ + Map map = (Map)user.getData(); + //发票、留言板、版本、客服电话 + Integer invoice =null; + if(UserTypeUtil.USER_TYPE.equals(userType)){ + invoice = redisService.getCacheObject("global:invoice:" + UserTypeUtil.USER + userid); + }else if(UserTypeUtil.INTERNET_TYPE.equals(userType)){ + invoice = redisService.getCacheObject("global:invoice:"+UserTypeUtil.INTERNET+userid); + }else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){ + invoice = redisService.getCacheObject("global:invoice:"+UserTypeUtil.COMMUNIT+userid); + }else{ + invoice = redisService.getCacheObject("global:invoice:"+UserTypeUtil.CUSTOMERS+userid); + } + if(invoice==null){ + map.put("invoiceNumber","0"); + }else{ + map.put("invoiceNumber",invoice); + } + Integer guestbook =null; + if(UserTypeUtil.USER_TYPE.equals(userType)){ + guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.USER_TYPE + ":" + map.get("phone").toString() + ":0:" + loginUser.getTenantId()); + }else if(UserTypeUtil.INTERNET_TYPE.equals(userType)){ + guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.INTERNET_TYPE + ":" + map.get("phone").toString() + ":0:" + loginUser.getTenantId()); + }else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){ + guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.COMMUNIT_TYPE + ":" + map.get("account").toString() + ":0:" + loginUser.getTenantId()); + }else{ + guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.CUSTOMERS_TYPE + ":" + map.get("account").toString() + ":0:" + loginUser.getTenantId()); + } + if(guestbook==null){ + map.put("guestbook","0"); + }else{ + map.put("guestbook",guestbook); + } + map.put("version",version); + map.put("servicePhone",servicePhone); + map.put("activity",0); + map.put("activitySize",1); + map.put("activityImg","https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/bunengshanchu/1.png"); + map.put("socSize",redisService.getCacheObject("global:SOC")); + return AjaxResult.success(map); }else{ - invoice = redisService.getCacheObject("global:invoice:"+UserTypeUtil.CUSTOMERS+userid); + return AjaxResult.error("请重新登录",HttpStatus.USER_LOGIN); } - if(invoice==null){ - map.put("invoiceNumber","0"); - }else{ - map.put("invoiceNumber",invoice); - } - Integer guestbook =null; - if(UserTypeUtil.USER_TYPE.equals(userType)){ - guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.USER_TYPE + ":" + map.get("phone").toString() + ":0:" + loginUser.getTenantId()); - }else if(UserTypeUtil.INTERNET_TYPE.equals(userType)){ - guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.INTERNET_TYPE + ":" + map.get("phone").toString() + ":0:" + loginUser.getTenantId()); - }else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){ - guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.COMMUNIT_TYPE + ":" + map.get("account").toString() + ":0:" + loginUser.getTenantId()); - }else{ - guestbook = redisService.getCacheObject("userNotReadMessageCount:"+UserTypeUtil.CUSTOMERS_TYPE + ":" + map.get("account").toString() + ":0:" + loginUser.getTenantId()); - } - if(guestbook==null){ - map.put("guestbook","0"); - }else{ - map.put("guestbook",guestbook); - } - map.put("version",version); - map.put("servicePhone",servicePhone); - map.put("activity",0); - map.put("activitySize",1); - map.put("activityImg","https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/bunengshanchu/1.png"); - map.put("socSize",redisService.getCacheObject("global:SOC")); - - return AjaxResult.success(map); - }else{ - return AjaxResult.error("请重新登录"); + }catch (Exception e){ + return AjaxResult.error("请重新登录",HttpStatus.USER_LOGIN); } }