From 7e338326644a172988f809dc10d7fb3c81392e06 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 28 May 2020 16:38:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=91=98=E8=BF=9B=E7=BB=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=80=E8=87=B4=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/group/redis/ResiGroupRedis.java   | 27 -------------------
 .../impl/ResiGroupStatisticalServiceImpl.java |  4 +--
 .../impl/ResiGroupMemberServiceImpl.java      |  7 ++---
 .../mapper/member/ResiGroupMemberDao.xml      |  6 ++---
 4 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java
index e2d19f2a03..7f2442a8e7 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java
@@ -99,33 +99,6 @@ public class ResiGroupRedis {
                     List<ResiGroupStatisticalDTO> statisticalMySql = statisticalService.list(param);
                     if(null != statisticalMySql && statisticalMySql.size() >= 1){
                         if(statisticalMySql.size() > 1){
-                        /*
-                        Collections.sort(statisticalMySql, new Comparator<ResiGroupStatisticalDTO>() {
-                            @Override
-                            public int compare(ResiGroupStatisticalDTO o1, ResiGroupStatisticalDTO o2) {
-                                if(null != o1.getCreatedTime() && null != o2.getCreatedTime()){
-                                    return
-                                            o1.getCreatedTime().getTime() > o2.getCreatedTime().getTime() ?
-                                             -1 : (o1.getCreatedTime().getTime() == o2.getCreatedTime().getTime() ?
-                                                    0: 1);
-                                }else{
-                                        return 0;
-                                }
-                            }
-                        });
-
-                        statisticalMySql.sort((ResiGroupStatisticalDTO o1, ResiGroupStatisticalDTO o2) ->
-                                o1.getCreatedTime().compareTo(o2.getCreatedTime())
-                        );
-                        //升序
-                        statisticalMySql.sort(Comparator.comparing(e -> e.getCreatedTime()));
-
-                        statisticalMySql.sort(Comparator.comparing(ResiGroupStatisticalDTO :: getCreatedTime,
-                                (o1 , o2) -> {
-                                  return o2.compareTo(o 1);
-                                }));
-                        */
-
                             //按照createdTime降序排序
                             statisticalMySql.sort(Comparator.comparing(ResiGroupStatisticalDTO :: getCreatedTime,
                                     Collections.reverseOrder()));
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java
index 51712abbcf..7d66e78a9a 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java
@@ -97,8 +97,8 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
 
         QueryWrapper<ResiGroupStatisticalEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-        wrapper.eq(StringUtils.isNotBlank((String)params.get(ModuleConstant.RESI_GROUP_ID_CAMEL)),ModuleConstant.RESI_GROUP_ID,params.get(ModuleConstant.RESI_GROUP_ID_CAMEL));
-        wrapper.eq(StringUtils.isNotBlank((String)params.get(FieldConstant.DEL_FLAG_HUMP)),FieldConstant.DEL_FLAG,params.get(FieldConstant.DEL_FLAG_HUMP));
+        wrapper.eq(StringUtils.isNotBlank((String)params.get(ModuleConstant.RESI_GROUP_ID)),ModuleConstant.RESI_GROUP_ID,params.get(ModuleConstant.RESI_GROUP_ID));
+        wrapper.eq(StringUtils.isNotBlank((String)params.get(FieldConstant.DEL_FLAG)),FieldConstant.DEL_FLAG,params.get(FieldConstant.DEL_FLAG));
         return wrapper;
     }
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index b0a3192d2c..b5c544f012 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -400,8 +400,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		baseDao.updateResiGroupStatistical(groupMemeberOperationDTO.getGroupId(), userRoleDTO);
 		//6、给用户发送消息
 		this.sendUserApprovedMessage(resiGroupMemberDTO);
-		//7、增加成员缓存信息
-		resiGroupDTO.setCustomerId(resiGroupDTO.getCustomerId());
+		//7、增加成员缓存信息(调用user服务拿取用户信息)
+		resiGroupMemberDTO.setCustomerId(resiGroupDTO.getCustomerId());
 		ResiGroupMemberInfoRedisDTO memberRedis = transferToMemberInfoRedis(resiGroupMemberDTO);
 		resiGroupMemberRedis.set(memberRedis);
 		//8、修改群组缓存信息
@@ -657,7 +657,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		ResiGroupMemberInfoRedisDTO targetObject =
 				ConvertUtils.sourceToTarget(memberDTO,ResiGroupMemberInfoRedisDTO.class);
 		targetObject.setMemberStatus(memberDTO.getStatus());
-		targetObject.setUserId(memberDTO.getId());
+		targetObject.setUserId(memberDTO.getCustomerUserId());
+		targetObject.setGroupId(memberDTO.getResiGroupId());
 		UserResiInfoFormDTO resiInfoParam = new UserResiInfoFormDTO();
 		resiInfoParam.setCustomerId(memberDTO.getCustomerId());
 		resiInfoParam.setUserId(memberDTO.getCustomerUserId());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
index 407e42879f..7910965741 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
@@ -45,14 +45,14 @@
     </select>
 
     <!--  同意进群之后修改统计值  -->
-    <update id="updateResiGroupStatistical" parameterType="map">
+    <update id="updateResiGroupStatistical">
         UPDATE resi_group_statistical rgs
             SET rgs.TOTAL_MEMBERS = rgs.TOTAL_MEMBERS + 1,
             rgs.TOTAL_NORMAL_MEMEBERS = rgs.TOTAL_NORMAL_MEMEBERS + 1
-            <if test="userRoleDTO.partymemberFlag != null and userRoleDTO.partymemberFlag== '1'">
+            <if test='null != userRoleDTO and userRoleDTO.partymemberFlag== "1"'>
                 ,rgs.TOTAL_PARTY_MEMBERS = rgs.TOTAL_PARTY_MEMBERS + 1
             </if>
-            <if test="userRoleDTO.warmHeartedFlag != null and userRoleDTO.warmHeartedFlag== '1'">
+            <if test='null != userRoleDTO and userRoleDTO.warmHeartedFlag== "1"'>
                 ,rgs.TOTAL_EARNEST_MEMEBERS = rgs.TOTAL_EARNEST_MEMEBERS + 1
             </if>
         WHERE