Merge branch 'master-new-activity' into dev

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/QueryLogDto.java

+package com.xxfc.platform.activity.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+@Data
+public class QueryLogDto extends PageParam {
+	Integer popularizeId;
+	Integer userId;
+}
\ No newline at end of file

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

@@ -5,17 +5,16 @@ 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;
 import com.xxfc.platform.activity.dto.ApLogDTO;
+import com.xxfc.platform.activity.dto.QueryLogDto;
 import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
 import com.xxfc.platform.activity.mapper.ActivityPopularizeLogMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * 用户参与推广活动（邀请有礼）的活动记录的记录（日志）
  *
@@ -24,6 +23,7 @@ import java.util.Map;
  * @date 2019-07-05 15:23:04
  */
 @Service
+@Slf4j
 public class ActivityPopularizeLogBiz extends BaseBiz<ActivityPopularizeLogMapper,ActivityPopularizeLog> implements UserRestInterface {
 
     @Autowired
@@ -48,17 +48,22 @@ public class ActivityPopularizeLogBiz extends BaseBiz<ActivityPopularizeLogMappe
         }
     }
 
-    public List<ActivityPopularizeLog> selectByUserId(Integer popularizeId) {
+    public PageDataVO<ActivityPopularizeLog> selectByUserId(QueryLogDto queryLogDto) {
 		AppUserDTO appUserDTO = getAppUser();
 		if (appUserDTO == null) {
-			return new ArrayList<>();
+			return new PageDataVO<>();
 		}
-		Map<String, Object> param = new HashMap<>();
-		param.put("userId", appUserDTO.getUserid());
-		param.put("popularizeId", popularizeId);
-		List<ActivityPopularizeLog> apl = mapper.selectByUserId(param);
-		return apl;
+		Integer page = queryLogDto.getPage() == null ? 1 : queryLogDto.getPage();
+		Integer limit = queryLogDto.getLimit() == null ? 5 : queryLogDto.getLimit();
+		queryLogDto.setUserId(appUserDTO.getUserid());
+		queryLogDto.setPage(page);
+		queryLogDto.setLimit(limit);
+		log.info("获取用户奖励记录： {}", queryLogDto.toString());
+		Query query = new Query(queryLogDto);
+		PageDataVO<ActivityPopularizeLog> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByUserId(query.getSuper()));
+		return pageDataVO;
 	}
 
 
+
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeLogController.java

@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.activity.biz.ActivityPopularizeLogBiz;
+import com.xxfc.platform.activity.dto.QueryLogDto;
 import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,8 +18,8 @@ public class ActivityPopularizeLogController extends BaseController<ActivityPopu
 	@GetMapping(value = "/getByUser")
 	@IgnoreClientToken
 	@IgnoreUserToken
-	public ObjectRestResponse selectByUserId(Integer popularizeId) {
-		return ObjectRestResponse.succ(baseBiz.selectByUserId(popularizeId));
+	public ObjectRestResponse selectByUserId(QueryLogDto queryLogDto) {
+		return ObjectRestResponse.succ(baseBiz.selectByUserId(queryLogDto));
 	}
 
 }
\ No newline at end of file