Merge remote-tracking branch 'origin/luck_draw_feature' into luck_draw_feature

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeUserBiz.java

@@ -3,7 +3,6 @@ package com.xxfc.platform.activity.biz;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.xxfc.platform.activity.entity.ActivityPopularizeUser;
 import com.xxfc.platform.activity.mapper.ActivityPopularizeUserMapper;
@@ -37,28 +36,23 @@ public class ActivityPopularizeUserBiz extends BaseBiz<ActivityPopularizeUserMap
 		mapper.deleteByExample(example);
 	}
 
-	public Map<String, Object> getByUserIdAndPopularizeId(Integer userId, List<Integer> popularizeIds) {
-		Map<String, Object> map = Maps.newHashMap();
+	public Map<Integer, Boolean> getByUserIdAndPopularizeId(Integer userId, List<Integer> popularizeIds) {
+		Map<Integer, Boolean> activityIds = Maps.newHashMap();
 		if (userId == null || popularizeIds == null) {
-			return map;
+			return activityIds;
 		}
-		map.put("userId", userId);
-        List<Map<Integer, Boolean>> activityIds = Lists.newArrayList();
         popularizeIds.parallelStream().forEach(id -> {
             Example example = new Example(ActivityPopularizeUser.class);
             Example.Criteria criteria = example.createCriteria();
             criteria.andEqualTo("userId", userId);
             criteria.andEqualTo("popularizeId", popularizeIds);
             ActivityPopularizeUser activityPopularizeUsers = mapper.selectOneByExample(example);
-            Map<Integer, Boolean> map1 = Maps.newHashMap();
             if (activityPopularizeUsers != null) {
-                map1.put(id, true);
+				activityIds.put(id, true);
             } else {
-                map1.put(id, false);
+				activityIds.put(id, false);
             }
-            activityIds.add(map1);
         });
-		map.put("popularizeIds", activityIds);
-		return map;
+		return activityIds;
 	}
 }
\ No newline at end of file