获取用户活动列表

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityPopularizeRelation.java

 package com.xxfc.platform.activity.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
 
 /**
  * 活动的参与者关系表
@@ -62,5 +65,7 @@ public class ActivityPopularizeRelation implements Serializable {
 	@ApiModelProperty(value = "活动id")
     private Integer popularizeId;
 
-
+    @Column(name = "num")
+	@ApiModelProperty(value = "第几个用户")
+	private Integer num;
 }

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

@@ -7,22 +7,19 @@ import com.github.wxiaoqi.security.admin.dto.RegisterQueueDTO;
 import com.github.wxiaoqi.security.admin.entity.MyWalletDetail;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import com.xxfc.platform.activity.dto.ApLogDTO;
-import com.xxfc.platform.activity.dto.AwardDTO;
+import com.xxfc.platform.activity.entity.ActivityPopularize;
 import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
 import com.xxfc.platform.activity.entity.ActivityPopularizeRelation;
 import com.xxfc.platform.activity.entity.ActivityPopularizeUser;
+import com.xxfc.platform.activity.mapper.ActivityPopularizeMapper;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
-import com.xxfc.platform.universal.feign.ThirdFeign;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.xxfc.platform.activity.entity.ActivityPopularize;
-import com.xxfc.platform.activity.mapper.ActivityPopularizeMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -88,12 +85,17 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
             }
 
             Integer majorUserId = Integer.valueOf(appUserDTO.getInviterAccount());
-
+            ActivityPopularizeRelation activityPopularizeRelation = new ActivityPopularizeRelation(){{
+                setMajorUserId(majorUserId);
+                setPopularizeId(activityPopularize.getId());
+            }};
+            Integer num = relationBiz.getByUserIdAndPopularizeId(activityPopularizeRelation);
             //添加活动关系
             relationBiz.insertSelective(new ActivityPopularizeRelation(){{
                 setPopularizeId(activityPopularize.getId());
                 setMajorUserId(majorUserId);
                 setMinorUserId(appUserDTO.getUserid());
+                setNum(num);
             }});
 
             ApLogDTO apLogDTO = popularizeLogBiz.selectOneApLogDTO(new ActivityPopularizeLog(){{

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

@@ -3,7 +3,6 @@ package com.xxfc.platform.activity.biz;
 import cn.hutool.core.bean.BeanUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
-import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -27,7 +26,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 @Service
 @Slf4j
-public class ActivityPopularizeLogBiz extends BaseBiz<ActivityPopularizeLogMapper,ActivityPopularizeLog> implements UserRestInterface {
+public class ActivityPopularizeLogBiz extends BaseBiz<ActivityPopularizeLogMapper,ActivityPopularizeLog>{
 
     @Autowired
     ActivityPopularizeItemBiz activityPopularizeItemBiz;
@@ -35,11 +34,6 @@ public class ActivityPopularizeLogBiz extends BaseBiz<ActivityPopularizeLogMappe
     @Autowired
 	UserFeign userFeign;
 
-	@Override
-	public UserFeign getUserFeign() {
-		return userFeign;
-	}
-
 	@Autowired
 	HttpServletRequest request;
 

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

 package com.xxfc.platform.activity.biz;
 
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.activity.dto.ActivityPopularizeRelationDTO;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.stereotype.Service;
-
 import com.xxfc.platform.activity.entity.ActivityPopularizeRelation;
 import com.xxfc.platform.activity.mapper.ActivityPopularizeRelationMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * 活动的参与者关系表
@@ -29,4 +29,17 @@ public class ActivityPopularizeRelationBiz extends BaseBiz<ActivityPopularizeRel
         }
         return activityPopularizeRelationDTOS;
     }
+
+    public Integer getByUserIdAndPopularizeId(ActivityPopularizeRelation activityPopularizeRelation) {
+       Integer num = mapper.getByUserIdAndPopularizeId(activityPopularizeRelation);
+        AtomicInteger atomicInteger = null;
+        if (num != null) {
+            atomicInteger = new AtomicInteger(num);
+            atomicInteger.incrementAndGet();
+        } else {
+            atomicInteger = new AtomicInteger(1);
+        }
+        int a = atomicInteger.get();
+        return a;
+    }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityPopularizeRelationMapper.java

@@ -17,4 +17,6 @@ import java.util.List;
 public interface ActivityPopularizeRelationMapper extends Mapper<ActivityPopularizeRelation> {
 
     List<ActivityPopularizeRelationDTO> findActivityPopularizeRelationsByActivityIdAndTime(@Param("activityId") Integer activityId, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
+
+    Integer getByUserIdAndPopularizeId(ActivityPopularizeRelation activityPopularizeRelation);
 }

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityPopularizeRelationMapper.xml

@@ -25,4 +25,8 @@
             and <![CDATA[ `crt_time` <= #{endTime}]]>
         </if>
     </select>
+
+    <select id="getByUserIdAndPopularizeId" parameterType="com.xxfc.platform.activity.entity.ActivityPopularizeRelation" resultType="Integer">
+        select num from activity_popularize_relation where major_user_id = #{majorUserId} and popularize_id = #{popularizeId} ORDER BY crt_time DESC LIMIT 1
+    </select>
 </mapper>
\ No newline at end of file