diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointRankListResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointRankListResultDTO.java
index b293ae4478..408c96a5c6 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointRankListResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointRankListResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 居民端积分总排行、周排行、月排行接口返参DTO
@@ -15,6 +14,10 @@ import java.util.List;
 public class ResiPointRankListResultDTO implements Serializable {
     private static final long serialVersionUID = 685408245193506541L;
 
+    /**
+     * 用户Id
+     */
+    private String userId;
     /**
      * 当前用户昵称
      * */
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java
index 59437dcff3..c69673d314 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java
@@ -6,7 +6,6 @@ import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.entity.PointVerificationStatisticalDailyEntity;
 import com.epmet.entity.UserPointStatisticalDailyEntity;
-import com.epmet.entity.UserPointTotalEntity;
 import com.epmet.service.PointVerificationStatisticalDailyService;
 import com.epmet.service.UserPointStatisticalDailyService;
 import com.epmet.service.UserPointTotalService;
@@ -62,10 +61,5 @@ public class TestController {
         pointVerificationStatisticalDailyService.testUnixKey(entity);
         return new Result();
     }
-    @PostMapping("testtotal")
-    public Result testTotal(@RequestBody UserPointTotalEntity entity){
-        userPointTotalService.testInsertOrUpdate(entity);
-        return new Result();
-    }
 }
 
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java
index e0faee76d1..8c9977dce8 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java
@@ -18,17 +18,13 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.UserPointTotalDTO;
 import com.epmet.dto.form.CommonUserFormDTO;
-import com.epmet.dto.form.ResiCommonUserIdFormDTO;
 import com.epmet.dto.form.ResiPointRankFormDTO;
 import com.epmet.dto.result.ResiPointDetailResultDTO;
 import com.epmet.dto.result.ResiPointRankListResultDTO;
 import com.epmet.entity.UserPointTotalEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 用户积分总计
@@ -38,66 +34,6 @@ import java.util.Map;
  */
 public interface UserPointTotalService extends BaseService<UserPointTotalEntity> {
 
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<UserPointTotalDTO>
-     * @author generator
-     * @date 2020-07-20
-     */
-    PageData<UserPointTotalDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<UserPointTotalDTO>
-     * @author generator
-     * @date 2020-07-20
-     */
-    List<UserPointTotalDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return UserPointTotalDTO
-     * @author generator
-     * @date 2020-07-20
-     */
-    UserPointTotalDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-07-20
-     */
-    void save(UserPointTotalDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-07-20
-     */
-    void update(UserPointTotalDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-07-20
-     */
-    void delete(String[] ids);
-
     /**
      * @Description 获取指定居民的积分信息
      * @param param
@@ -125,8 +61,6 @@ public interface UserPointTotalService extends BaseService<UserPointTotalEntity>
     **/
     void insertOrUpdate(UserPointTotalEntity entity);
 
-    void testInsertOrUpdate(UserPointTotalEntity entity);
-
     /**
      * @Description 获取指定居民的积分信息 - 使用客户Id匹配，兼容多客户情况
      * @param customerUserParam
@@ -135,4 +69,4 @@ public interface UserPointTotalService extends BaseService<UserPointTotalEntity>
      * @date 2020.07.22 15:58
      **/
     ResiPointDetailResultDTO getMyPointGroupByCustomer(CommonUserFormDTO customerUserParam);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
index 45ac10f2ba..16400b1eaa 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
@@ -149,7 +149,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         if(myResiInfoResult.success() && null != myResiInfoResult.getData() && !myResiInfoResult.getData().isEmpty()){
                if(StringUtils.isBlank(pointRankFormDTO.getCustomerId())) {
                    //缓存中的customerId是不准确的，前端一定会传customerId，所以不会执行此代码
-                   log.warn("com.epmet.service.impl.UserPointTotalServiceImpl.getPointRanking，传参缺失客户Id，参数：{}",pointRankFormDTO);
+                   log.warn("getPointRanking，传参缺失客户Id，参数：{}",pointRankFormDTO);
                    //缓存中陌生人游客也有对应的customerId
                    pointRankFormDTO.setCustomerId(myResiInfoResult.getData().get(NumConstant.ZERO).getCustomerId());
                 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java
index 07243fd0ab..7ba7c79b4e 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java
@@ -17,34 +17,27 @@
 
 package com.epmet.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.UserPointTotalDao;
-import com.epmet.dto.UserPointTotalDTO;
 import com.epmet.dto.form.CommonUserFormDTO;
-import com.epmet.dto.form.ResiCommonUserIdFormDTO;
 import com.epmet.dto.form.ResiPointRankFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.UserPointTotalEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.UserPointTotalService;
-import com.epmet.utils.DimIdGenerator;
-import com.epmet.utils.ModuleConstant;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -57,62 +50,9 @@ import java.util.stream.Collectors;
 @Slf4j
 public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao, UserPointTotalEntity> implements UserPointTotalService {
 
-
     @Autowired
     EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
-    @Override
-    public PageData<UserPointTotalDTO> page(Map<String, Object> params) {
-        IPage<UserPointTotalEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, UserPointTotalDTO.class);
-    }
-
-    @Override
-    public List<UserPointTotalDTO> list(Map<String, Object> params) {
-        List<UserPointTotalEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, UserPointTotalDTO.class);
-    }
-
-    private QueryWrapper<UserPointTotalEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<UserPointTotalEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public UserPointTotalDTO get(String id) {
-        UserPointTotalEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, UserPointTotalDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(UserPointTotalDTO dto) {
-        UserPointTotalEntity entity = ConvertUtils.sourceToTarget(dto, UserPointTotalEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(UserPointTotalDTO dto) {
-        UserPointTotalEntity entity = ConvertUtils.sourceToTarget(dto, UserPointTotalEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
-
     /**
      * @Description 获取指定居民的积分信息
      * @param param
@@ -145,8 +85,7 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
         //1.获取当前用户昵称以及当前用户所属客户Id
         List<String> userIdParam = new LinkedList<>();
         userIdParam.add(pointRankFormDTO.getUserId());
-        Result<List<UserBaseInfoResultDTO>> myResiInfoResult =
-                epmetUserOpenFeignClient.queryUserBaseInfo(userIdParam);
+        Result<List<UserBaseInfoResultDTO>> myResiInfoResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIdParam);
         if(myResiInfoResult.success() && null != myResiInfoResult.getData() && !myResiInfoResult.getData().isEmpty()){
             if(StringUtils.isBlank(pointRankFormDTO.getCustomerId())) {
                 //缓存中的customerId是不准确的，前端一定会传customerId，所以不会执行此代码
@@ -204,19 +143,23 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
 
         List<String> userIds = rankList.stream().map(ResiPointRankResultDTO::getUserId).collect(Collectors.toList());
         //查询用户昵称
-        Result<List<UserBaseInfoResultDTO>> userInfo =
-                epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
-        boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty();
-
-        for (int i = NumConstant.ZERO; i < rankList.size(); i++) {
-            ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o,ResiPointRankListResultDTO.class);
+        Result<List<UserBaseInfoResultDTO>> userInfo = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+        Map<String,UserBaseInfoResultDTO> userInfoMap = new HashMap<>();
+        if (userInfo.success() && CollectionUtils.isNotEmpty(userInfo.getData())){
+            userInfoMap = userInfo.getData().stream().collect(Collectors.toMap(UserBaseInfoResultDTO::getUserId, Function.identity(),(o1, o2)->o1));
+        }
 
+        for (ResiPointRankResultDTO resiPointRankResultDTO : rankList) {
+            ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o, ResiPointRankListResultDTO.class);
             ResiPointRankingResultDTO target = new ResiPointRankingResultDTO();
-            target.setRanking(rankList.get(i).getRank());
-            target.setPoint(rankList.get(i).getTotalPoint());
-            if(userRequestCallback) {
-                target.setNickname(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getNickname());
-                target.setHeadImgUrl(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getHeadImgUrl());
+            target.setRanking(resiPointRankResultDTO.getRank());
+            target.setPoint(resiPointRankResultDTO.getTotalPoint());
+            target.setNickname(StrConstant.EPMETY_STR);
+            target.setHeadImgUrl(StrConstant.EPMETY_STR);
+            UserBaseInfoResultDTO infoResultDTO = userInfoMap.get(resiPointRankResultDTO.getUserId());
+            if (infoResultDTO != null) {
+                target.setNickname(infoResultDTO.getNickname());
+                target.setHeadImgUrl(infoResultDTO.getHeadImgUrl());
             }
             resultObj.setRankList(target);
             result.add(resultObj);
@@ -234,21 +177,6 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
     @Override
     public void insertOrUpdate(UserPointTotalEntity entity) {
         baseDao.insertOrUpdate(entity);
-        /*
-        UserPointTotalEntity existed = baseDao.selectIfExisted(entity.getUserId());
-        if(null != existed && StringUtils.isNotBlank(existed.getId())){
-            existed.setUsedPoint(null == existed.getUsedPoint() ? entity.getUsedPoint() : entity.getUsedPoint() + existed.getUsedPoint());
-            existed.setUsablePoint(null == existed.getUsablePoint() ? entity.getUsablePoint() : entity.getUsablePoint() + existed.getUsablePoint());
-            existed.setTotalPoint(null == existed.getTotalPoint() ? entity.getTotalPoint() : entity.getTotalPoint() + existed.getTotalPoint());
-            updateById(existed);
-        }else{
-            insert(entity);
-        }*/
-    }
-
-    @Override
-    public void testInsertOrUpdate(UserPointTotalEntity entity) {
-        baseDao.insertOrUpdate(entity);
     }
 
 
@@ -267,4 +195,4 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
         return result;
     }
 
-}
\ No newline at end of file
+}