From 4f78974c84bdd0fd1801439bdc22b149f89ea81b Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Thu, 14 May 2020 14:50:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E5=96=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=94=A8=E6=88=B7=20redis=E5=AD=98=E5=82=A8=E9=83=A8=E9=97=A8I?= =?UTF-8?q?D=20bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/feign/UsersFeignClient.java | 12 +++++++++++- .../feign/fallback/UsersFeignClientFallback.java | 6 ++++++ .../elink/esua/epdc/mq/PointsModifyConsumer.java | 10 ++++++++++ .../controller/UserGridRelationController.java | 14 ++++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java index 2d79b0f8..1fd09f99 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.UserDTO; +import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.feign.fallback.UsersFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; @@ -47,5 +48,14 @@ public interface UsersFeignClient { @PostMapping(value = "app-user/user/handleUserPoints", consumes = MediaType.APPLICATION_JSON_VALUE) Result handleUserPoints(EpdcUserPointsFormDTO formDTO); - + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 获取用户最后一次切换网格信息 + * @Author songyunpeng + * @Date 2020/5/14 + * @Param [userId] + **/ + @GetMapping(value = "app-user/usergrid/getUserLastSwitchGird/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getUserLastSwitchGird(@PathVariable("userId") String userId); } + diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java index a00b4927..49c34cad 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java @@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.UserDTO; +import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.feign.UsersFeignClient; import org.springframework.stereotype.Component; @@ -29,4 +30,9 @@ public class UsersFeignClientFallback implements UsersFeignClient { public Result handleUserPoints(EpdcUserPointsFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "handleUserPoints", formDTO); } + + @Override + public Result getUserLastSwitchGird(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserLastSwitchGird", userId); + } } 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 df5b7e39..14a4d4a5 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 @@ -7,6 +7,7 @@ import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.UserDTO; +import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.form.PointsLogsAddFormDTO; import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; @@ -144,6 +145,15 @@ public class PointsModifyConsumer implements RocketMQListener { if (userDTO == null) { return; } + //判断用户是否完善信息 + 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()); + } //2.更新用户积分分数 if (OPERATION_TYPE_ADD.equals(pointsRuleResultDTO.getOperationType())) { userDTO.setPoints(userDTO.getPoints() + pointsRuleResultDTO.getPoints()); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java index a4ca83a5..f7c5e3f2 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java @@ -89,6 +89,20 @@ public class UserGridRelationController { return new Result>().ok(data); } + + /** + * @Description 获取用户最后一次切换网格信息 + * @Author songyunpeng + * @Date 2020/5/14 + * @Param [userId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @GetMapping("getUserLastSwitchGird/{userId}") + public Result getUserLastSwitchGird(@PathVariable("userId") String userId){ + UserGridRelationDTO data = userGridRelationService.getUserLastSwitchGird(userId); + return new Result().ok(data); + } + /** * @param id epdc_user_grid_relation表主键 * @return com.elink.esua.epdc.commons.tools.utils.Result