| @@ -987,13 +987,14 @@ public class WxUserGrantController extends BaseController { | |||||
| public ResultData getUserinfoQrCode() { | public ResultData getUserinfoQrCode() { | ||||
| WxCUser user = getWxCUser(); | WxCUser user = getWxCUser(); | ||||
| if(user.basicInfoIs()){ | if(user.basicInfoIs()){ | ||||
| String key = Constant.cuserQr+user.getUserId(); | |||||
| String key = Constant.cuserQr+ getTenantInfo().getTenantId() + ":" +user.getUserId(); | |||||
| String qrCode = RedisCacheUtils.getCacheString(objectCommonRedisTemplate, key); | String qrCode = RedisCacheUtils.getCacheString(objectCommonRedisTemplate, key); | ||||
| if(StringUtils.isBlank(qrCode)){ | if(StringUtils.isBlank(qrCode)){ | ||||
| WxCUserBasicInfo wxCUserBasicInfo; | WxCUserBasicInfo wxCUserBasicInfo; | ||||
| try { | try { | ||||
| wxCUserBasicInfo = getShortCacheMember(user.getUserId(),getFinalTenantId()); | wxCUserBasicInfo = getShortCacheMember(user.getUserId(),getFinalTenantId()); | ||||
| if(StringUtils.isNotBlank(wxCUserBasicInfo.getQrCode())){ | |||||
| if(StringUtils.isBlank(getTenantInfo().getParentTenantId()) | |||||
| && StringUtils.isNotBlank(wxCUserBasicInfo.getQrCode())){ | |||||
| qrCode = wxCUserBasicInfo.getQrCode(); | qrCode = wxCUserBasicInfo.getQrCode(); | ||||
| }else{ | }else{ | ||||
| String param = wxCUserBasicInfo.getWeappScene(); | String param = wxCUserBasicInfo.getWeappScene(); | ||||
| @@ -1004,23 +1005,24 @@ public class WxUserGrantController extends BaseController { | |||||
| if(map!=null && map.get("url") !=null) { | if(map!=null && map.get("url") !=null) { | ||||
| String url = map.get("url"); | String url = map.get("url"); | ||||
| qrCode = url; | qrCode = url; | ||||
| wxCUserBasicInfo.setQrCode(url); | |||||
| wxCUserBasicInfoService.updateQrCode(wxCUserBasicInfo); | |||||
| }else{ | }else{ | ||||
| logger.error("getUserinfoQrCode error."+resultData.toString()); | logger.error("getUserinfoQrCode error."+resultData.toString()); | ||||
| return new ResultData(ErrorCode.DEVICE_QRCODE_GET_FAILED); | return new ResultData(ErrorCode.DEVICE_QRCODE_GET_FAILED); | ||||
| } | } | ||||
| if(StringUtils.isBlank(getTenantInfo().getParentTenantId())){ | |||||
| wxCUserBasicInfo.setQrCode(qrCode); | |||||
| wxCUserBasicInfoService.updateQrCode(wxCUserBasicInfo); | |||||
| } | |||||
| } | } | ||||
| RedisCacheUtils.cache(objectCommonRedisTemplate, key, qrCode, Constant.S_D_EXPIRE); | RedisCacheUtils.cache(objectCommonRedisTemplate, key, qrCode, Constant.S_D_EXPIRE); | ||||
| return new ResultData(qrCode); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("getUserinfoQrCode error.",e); | logger.error("getUserinfoQrCode error.",e); | ||||
| return new ResultData(ErrorCode.SYS_SERVER_ERROR); | return new ResultData(ErrorCode.SYS_SERVER_ERROR); | ||||
| } | } | ||||
| }else{ | |||||
| return new ResultData(qrCode); | |||||
| } | } | ||||
| return new ResultData(qrCode); | |||||
| }else{ | }else{ | ||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER); | return new ResultData(ErrorCode.USER_IS_NOT_MEMBER); | ||||
| } | } | ||||