Merge branch 'luck_draw_feature' into dev

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

@@ -66,7 +66,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
     public static final Integer INVITE_ITEMID = 3;
 
     public void handleRegister(RegisterQueueDTO registerQueueDTO) {
-
+        log.info("活动码注册成功：registerQueueDTO = {}", registerQueueDTO.toString());
         if (StringUtils.isNotBlank(registerQueueDTO.getInParamDTO().getActivityCode())) {
             String activityCode = registerQueueDTO.getInParamDTO().getActivityCode().replace(PREFIX, "");
             AppUserDTO appUserDTO = userFeign.userDetailById(registerQueueDTO.getAppUserId()).getData();
@@ -76,6 +76,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
                 ActivityPopularize activityPopularize = popularizeBiz.selectOne(new ActivityPopularize(){{
                     setCode(activityCode);
                 }});
+                log.info("活动邀请注册：activityPopularize = {}", activityPopularize.toString());
                 if (activityPopularize != null) {
                     List<ActivityPopularizeItem> activityPopularizeItems = activityPopularizeItemBiz.selectByPopularizeId(activityPopularize.getId());
                     ActivityPopularizeItem activityPopularizeItem = activityPopularizeItems.get(activityPopularizeItems.size() - 1);

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

 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 org.springframework.stereotype.Service;
-
+import com.google.common.collect.Maps;
 import com.xxfc.platform.activity.entity.ActivityPopularizeUser;
 import com.xxfc.platform.activity.mapper.ActivityPopularizeUserMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户与推广活动（邀请有礼）的关系表
@@ -19,19 +20,39 @@ import java.util.List;
  * @date 2019-07-05 15:23:04
  */
 @Service
-public class ActivityPopularizeUserBiz extends BaseBiz<ActivityPopularizeUserMapper,ActivityPopularizeUser> {
-    public ActivityPopularizeUser insertSelectiveReT(ActivityPopularizeUser entity) {
-        if(insertSelectiveRe(entity) > 0) {
-            return selectById(entity.getId());
-        }else {
-            throw new BaseException(ResultCode.DB_OPERATION_FAIL_CODE);
-        }
-    }
+public class ActivityPopularizeUserBiz extends BaseBiz<ActivityPopularizeUserMapper, ActivityPopularizeUser> {
+	public ActivityPopularizeUser insertSelectiveReT(ActivityPopularizeUser entity) {
+		if (insertSelectiveRe(entity) > 0) {
+			return selectById(entity.getId());
+		} else {
+			throw new BaseException(ResultCode.DB_OPERATION_FAIL_CODE);
+		}
+	}
+
+	public void deleteByUserIds(List<Integer> userIds) {
+		Example example = new Example(ActivityPopularizeUser.class);
+		Example.Criteria criteria = example.createCriteria();
+		criteria.andIn("userId", userIds);
+		mapper.deleteByExample(example);
+	}
 
-    public void deleteByUserIds(List<Integer> userIds) {
-        Example example  = new Example(ActivityPopularizeUser.class);
-        Example.Criteria criteria = example.createCriteria();
-        criteria.andIn("userId",userIds);
-        mapper.deleteByExample(example);
-    }
+	public Map<Integer, Boolean> getByUserIdAndPopularizeId(Integer userId, List<Integer> popularizeIds) {
+		Map<Integer, Boolean> activityIds = Maps.newHashMap();
+		if (userId == null || popularizeIds == null) {
+			return activityIds;
+		}
+        popularizeIds.parallelStream().forEach(id -> {
+            Example example = new Example(ActivityPopularizeUser.class);
+            Example.Criteria criteria = example.createCriteria();
+            criteria.andEqualTo("userId", userId);
+            criteria.andEqualTo("popularizeId", id);
+            ActivityPopularizeUser activityPopularizeUsers = mapper.selectOneByExample(example);
+            if (activityPopularizeUsers != null) {
+				activityIds.put(id, true);
+            } else {
+				activityIds.put(id, false);
+            }
+        });
+		return activityIds;
+	}
 }
\ No newline at end of file