Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserIdAndBadgeIdResultDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/20 上午9:54
+ */
+@Data
+public class UserIdAndBadgeIdResultDTO implements Serializable {
+
+    private String userId;
+
+    private String badgeId;
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ResiUserBadgeDao.java

@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ResiUserBadgeDTO;
+import com.epmet.dto.result.UserIdAndBadgeIdResultDTO;
 import com.epmet.entity.ResiUserBadgeEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -43,6 +44,6 @@ public interface ResiUserBadgeDao extends BaseDao<ResiUserBadgeEntity> {
      */
     void insertResiUserBadge(@Param("badges")List<ResiUserBadgeDTO> badges);
 
-    List<String> selectUserIds();
+    List<UserIdAndBadgeIdResultDTO> selectUserIds();
 
 }

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

@@ -150,7 +150,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
      */
     @Override
     public void initPartyMemberBadge(String userId,TokenDto tokenDto){
-        List<String> userIds = resiUserBadgeDao.selectUserIds();
+        List<UserIdAndBadgeIdResultDTO> userIds = resiUserBadgeDao.selectUserIds();
         List<ResiUserBadgeDTO> badges = new ArrayList<>();
         String partyBadgeId = badgeDao.getPartyBadgeId(null);
         if (StringUtils.isEmpty(userId)) {
@@ -159,7 +159,13 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                 return;
             }
             if (!CollectionUtils.isEmpty(userIds)) {
-                userIds.stream().forEach(u -> partyMemberUserIds.stream().filter(p -> u.equals(p.getUserId())).forEach(p -> p.setReStatus(true)));
+                userIds.forEach(u -> {
+                    partyMemberUserIds.forEach(p -> {
+                        if (u.getUserId().equals(p.getUserId()) && u.getBadgeId().equals(partyBadgeId)){
+                            p.setReStatus(true);
+                        }
+                    });
+                });
             }
             List<String> reUserIds = partyMemberUserIds.stream().filter(p -> !p.getReStatus()).map(p -> p.getUserId()).collect(Collectors.toList());
             List<UserBaseInfoResultDTO> userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfo(reUserIds);

epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml

@@ -41,8 +41,8 @@
         </foreach>
     </insert>
 
-    <select id="selectUserIds" resultType="java.lang.String">
+    <select id="selectUserIds" resultType="com.epmet.dto.result.UserIdAndBadgeIdResultDTO">
-        SELECT USER_ID FROM resi_user_badge WHERE DEL_FLAG = 0
+        SELECT USER_ID,BADGE_ID FROM resi_user_badge WHERE DEL_FLAG = 0
     </select>