diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java index 14a4d4a5..a87c8995 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java @@ -146,13 +146,16 @@ public class PointsModifyConsumer implements RocketMQListener { return; } //判断用户是否完善信息 + Long gridId = 0L; if(userDTO.getDeptId() == null || userDTO.getDeptId() == 0L){ //获取网格人员关系表 Result userLastSwitchGird = usersFeignClient.getUserLastSwitchGird(userDTO.getId()); if(!userLastSwitchGird.success() || userLastSwitchGird.getData()==null){ return; } - userDTO.setDeptId(userLastSwitchGird.getData().getGridId()); + gridId = userLastSwitchGird.getData().getGridId(); + }else{ + gridId = userDTO.getDeptId(); } //2.更新用户积分分数 if (OPERATION_TYPE_ADD.equals(pointsRuleResultDTO.getOperationType())) { @@ -166,7 +169,7 @@ public class PointsModifyConsumer implements RocketMQListener { //4.更新redis用户积分情况 TokenDto tokenDto = ConvertUtils.sourceToTarget(userDTO, TokenDto.class); tokenDto.setUserId(userDTO.getId()); - tokenDto.setGridId(userDTO.getDeptId()); + tokenDto.setGridId(gridId); int expire = jwtTokenProperties.getExpire(); cpUserDetailRedis.set(tokenDto, expire); //更新用户的积分 -- 结束