未完善信息用户 redis存储部门ID bug修改

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<UserDTO> handleUserPoints(EpdcUserPointsFormDTO formDTO);
 
-
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserGridRelationDTO>
+     * @Description 获取用户最后一次切换网格信息
+     * @Author songyunpeng
+     * @Date 2020/5/14
+     * @Param [userId]
+     **/
+    @GetMapping(value = "app-user/usergrid/getUserLastSwitchGird/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<UserGridRelationDTO> getUserLastSwitchGird(@PathVariable("userId") String userId);
 }
+     

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<UserDTO> handleUserPoints(EpdcUserPointsFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "handleUserPoints", formDTO);
     }
+
+    @Override
+    public Result<UserGridRelationDTO> getUserLastSwitchGird(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserLastSwitchGird", userId);
+    }
 }

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<MessageExt> {
         if (userDTO == null) {
             return;
         }
+        //判断用户是否完善信息
+        if(userDTO.getDeptId() == null || userDTO.getDeptId() == 0L){
+            //获取网格人员关系表
+            Result<UserGridRelationDTO> 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());

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<List<UserGridRelationDTO>>().ok(data);
     }
 
+
+    /**
+     * @Description  获取用户最后一次切换网格信息 
+     * @Author songyunpeng
+     * @Date  2020/5/14
+     * @Param [userId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserGridRelationDTO>
+     **/
+    @GetMapping("getUserLastSwitchGird/{userId}")
+    public Result<UserGridRelationDTO> getUserLastSwitchGird(@PathVariable("userId") String userId){
+        UserGridRelationDTO data = userGridRelationService.getUserLastSwitchGird(userId);
+        return new Result<UserGridRelationDTO>().ok(data);
+    }
+    
     /**
      * @param id epdc_user_grid_relation表主键
      * @return com.elink.esua.epdc.commons.tools.utils.Result