居民端用户个人信息查询接口调整

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java

@@ -1,8 +1,6 @@
 package com.epmet.feign;
 
-import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.ResiPointDetailResultDTO;
 import com.epmet.feign.fallback.EpmetPointOpenFeignClientFallback;
@@ -20,11 +18,11 @@ public interface EpmetPointOpenFeignClient {
 
     /**
      * @Description 获取指定居民的积分信息
-     * @param dto
+     * @param
      * @return
      * @author wangc
      * @date 2020.07.22 15:58
      **/
     @GetMapping("/point/resi/point/mypoint")
-    Result<ResiPointDetailResultDTO> myPoint(TokenDto dto);
+    Result<ResiPointDetailResultDTO> myPoint();
 }

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/fallback/EpmetPointOpenFeignClientFallback.java

@@ -1,7 +1,6 @@
 package com.epmet.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.ResiPointDetailResultDTO;
@@ -17,7 +16,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class EpmetPointOpenFeignClientFallback implements EpmetPointOpenFeignClient {
     @Override
-    public Result<ResiPointDetailResultDTO> myPoint(TokenDto dto) {
+    public Result<ResiPointDetailResultDTO> myPoint() {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_POINT_SERVER, "myPoint", dto);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_POINT_SERVER, "myPoint");
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -3,7 +3,6 @@ package com.epmet.service.impl;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.Result;
@@ -203,9 +202,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userRoleFormDTO.setGridId(myResiUserInfoFormDTO.getGridId());
             result.setRoleList(userRoleDao.getUserRoleList(userRoleFormDTO));
 
-            TokenDto dto = new TokenDto();
+            Result<ResiPointDetailResultDTO> pointResult = epmetPointOpenFeignClient.myPoint();
-            dto.setUserId(myResiUserInfoFormDTO.getUserId());
-            Result<ResiPointDetailResultDTO> pointResult = epmetPointOpenFeignClient.myPoint(dto);
             if(pointResult.success() && null != pointResult.getData()){
                 //累计积分
                 result.setPoint(pointResult.getData().getUsablePoint());