Merge branch 'master-new-activity' into dev

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

@@ -54,7 +54,7 @@ public class ActivityPopularizeLogBiz extends BaseBiz<ActivityPopularizeLogMappe
 		example.createCriteria().andEqualTo("userId", entity.getUserId()).andEqualTo("itemId", entity.getItemId()).andEqualTo("popularizeId", entity.getPopularizeId());
 		return mapper.selectOneByExample(example);
 	}
-    public PageDataVO<ActivityPopularizeLog> selectByUserId(QueryLogDto queryLogDto) {
+    public PageDataVO<ApLogDTO> selectByUserId(QueryLogDto queryLogDto) {
 		String token = request.getHeader("Authorization");
 		AppUserDTO appUserDTO = null;
 		if (StringUtils.isNotBlank(token)) {
@@ -69,11 +69,10 @@ public class ActivityPopularizeLogBiz extends BaseBiz<ActivityPopularizeLogMappe
 		queryLogDto.setPage(page);
 		queryLogDto.setLimit(limit);
 		Query query = new Query(queryLogDto);
-		PageDataVO<ActivityPopularizeLog> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByUserId(query.getSuper()));
+		PageDataVO<ApLogDTO> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByUserId(query.getSuper()));
 		if (pageDataVO.getData() != null) {
 			pageDataVO.getData().parallelStream().forEach(result -> {
-				ApLogDTO apLogDTO = BeanUtil.toBean(result, ApLogDTO.class);
-				apLogDTO.setItem(activityPopularizeItemBiz.selectById(apLogDTO.getItemId()));
+				result.setItem(activityPopularizeItemBiz.selectById(result.getItemId()));
 			});
 		}
 		return pageDataVO;

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

 package com.xxfc.platform.activity.mapper;
 
+import com.xxfc.platform.activity.dto.ApLogDTO;
 import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -14,5 +15,5 @@ import java.util.Map;
  * @date 2019-07-05 15:23:04
  */
 public interface ActivityPopularizeLogMapper extends Mapper<ActivityPopularizeLog> {
-	List<ActivityPopularizeLog> selectByUserId(Map<String, Object> param);
+	List<ApLogDTO> selectByUserId(Map<String, Object> param);
 }

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

@@ -15,7 +15,7 @@
         <result property="itemId" column="item_id"/>
     </resultMap>
 
-    <select id="selectByUserId" resultType="com.xxfc.platform.activity.entity.ActivityPopularizeLog" parameterType="Map">
+    <select id="selectByUserId" resultType="com.xxfc.platform.activity.dto.ApLogDTO" parameterType="Map">
         select * from activity_log_list where user_id = #{userId} and popularize_id = #{popularizeId}
         ORDER BY crt_time
     </select>