|
|
@@ -2,6 +2,7 @@ package com.cyksj.web.controller.distribute;
|
|
|
|
|
|
import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.cyksj.common.constant.Constant;
|
|
|
@@ -125,6 +126,7 @@ public class DistributeRankController {
|
|
|
*/
|
|
|
@GetMapping("/get/previous/winners")
|
|
|
public Result<List<DistributeUserRankView>> getPreviousWinners(@RequestParam(defaultValue = "0") Integer type, @RequestParam(defaultValue = "week") String statisticsType) {
|
|
|
+ long userId = StpUserUtil.getLoginIdAsLong();
|
|
|
String lastTime;
|
|
|
if (Constant.week.equals(statisticsType)) {
|
|
|
//上周一
|
|
|
@@ -139,6 +141,13 @@ public class DistributeRankController {
|
|
|
orderByField = "orders";
|
|
|
}
|
|
|
List<DistributeUserRankView> ranks = userDistributeRankStatisticsRecordMapper.getPreviousWinners(orderByField, lastTime);
|
|
|
+
|
|
|
+ ranks.forEach(rank -> {
|
|
|
+ if (ObjectUtil.equal(userId, rank.getUserId())) {
|
|
|
+ //在前10
|
|
|
+ rank.setIsPrize(true);
|
|
|
+ }
|
|
|
+ });
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(ranks);
|
|
|
}
|
|
|
|