From 4ecde84040dc36a8e89bf603c63a336b0e3ed567 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 14 Sep 2021 15:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=8E=92=E8=A1=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/MyPointRankResultDTO.java   | 1 +
 .../impl/UserPointStatisticalDailyServiceImpl.java        | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java
index 484c8f8055..2eb5afc433 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointRankResultDTO.java
@@ -18,4 +18,5 @@ public class MyPointRankResultDTO implements Serializable {
     private String headPhoto;
     private String gridRank;
     private String customerRank;
+    private String userName;
 }
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 5842e34bf6..c6a23b59df 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
@@ -23,6 +23,7 @@ import com.epmet.common.enu.AroundPartyConstant;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -351,6 +352,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         }
         MyPointRankResultDTO result = new MyPointRankResultDTO();
         result.setHeadPhoto(myInfoResult.getData().get(0).getHeadImgUrl());
+        result.setUserName(myInfoResult.getData().get(0).getRealName());
         //获取客户下用户积分
         List<BizPointUserTotalDetailDTO> list = getUserPointList(tokenDto.getCustomerId(), null, null);
         result.setCustomerRank(getRank(list, tokenDto.getUserId()));
@@ -378,7 +380,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         if (!gridInfoResult.success()) {
             throw new RenException(gridInfoResult.getCode());
         }
-        result.setGridName(gridInfoResult.getData().getGridName());
+        result.setGridName(gridInfoResult.getData().getParentAgencyName() + StrConstant.HYPHEN + gridInfoResult.getData().getGridName());
         String agencyId = gridInfoResult.getData().getParentAgencyId();
         //获取客户下用户积分
         List<BizPointUserTotalDetailDTO> list = getGridPointList(tokenDto.getCustomerId(), null);
@@ -453,6 +455,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
 
     private Boolean havePoint(List<BizPointUserTotalDetailDTO> list, String userId) {
         Map<String, Integer> map = list.stream().collect(Collectors.toMap(BizPointUserTotalDetailDTO::getUserId, BizPointUserTotalDetailDTO::getTotalPoint));
+        String point = null == map.get(userId)?"0":Integer.toString(map.get(userId));
+        log.info("userPoint:" + point);
         return null != map.get(userId);
     }
 
@@ -463,6 +467,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         }
         //如果当月网格没有积分变动，则积分为0
         Map<String, Integer> map = list.stream().collect(Collectors.toMap(BizPointUserTotalDetailDTO::getGridId, BizPointUserTotalDetailDTO::getTotalPoint));
+        String points = null == map.get(gridId)?"0":Integer.toString(map.get(gridId));
+        log.info("gridPoint:" + points);
         if (null == map.get(gridId)) {
             BizPointUserTotalDetailDTO dto = new BizPointUserTotalDetailDTO();
             dto.setGridId(gridId);