Merge branch 'master-new-activity' into dev

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

@@ -12,9 +12,12 @@ 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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 用户参与推广活动（邀请有礼）的活动记录的记录（日志）
  *
@@ -37,6 +40,9 @@ public class ActivityPopularizeLogBiz extends BaseBiz<ActivityPopularizeLogMappe
 		return userFeign;
 	}
 
+	@Autowired
+	HttpServletRequest request;
+
     public ApLogDTO selectOneApLogDTO(ActivityPopularizeLog entity){
         ActivityPopularizeLog apl = mapper.selectOne(entity);
         if(null != apl) {
@@ -49,16 +55,19 @@ public class ActivityPopularizeLogBiz extends BaseBiz<ActivityPopularizeLogMappe
     }
 
     public PageDataVO<ActivityPopularizeLog> selectByUserId(QueryLogDto queryLogDto) {
-		AppUserDTO appUserDTO = getAppUser();
-		if (appUserDTO == null) {
+		String token = request.getHeader("Authorization");
+		AppUserDTO appUserDTO = null;
+		if (StringUtils.isNotBlank(token)) {
+			appUserDTO = userFeign.userDetailByToken(token).getData();
+		} else {
 			return new PageDataVO<>();
 		}
+
 		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;

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

@@ -17,6 +17,7 @@
 
     <select id="selectByUserId" resultType="com.xxfc.platform.activity.entity.ActivityPopularizeLog" parameterType="Map">
         select * from activity_log_list where user_id = #{userId} and popularize_id = #{popularizeId}
+        ORDER BY crt_time
     </select>
 
 </mapper>
\ No newline at end of file