zoujiajian 2 лет назад
Родитель
Сommit
b11da62b6f

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/views/DistributeUserRankView.java

@@ -3,6 +3,7 @@ package com.cyksj.model.views;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -24,6 +25,7 @@ public class DistributeUserRankView {
 	private Integer rankId;
 
 	@DbField("udsr.user_id")
+	@JsonIgnore
 	private Long userId;
 
 	@DbField("concat(LEFT(ifnull(u.nickname,udsr.nickname),1),'*',RIGHT(ifnull(u.nickname,udsr.nickname),1))")
@@ -46,4 +48,7 @@ public class DistributeUserRankView {
 
 	@DbIgnore
 	private BigDecimal gapMoney;
+
+	@DbIgnore
+	private Boolean isPrize = false;
 }

+ 9 - 0
netflix-web/src/main/java/com/cyksj/web/controller/distribute/DistributeRankController.java

@@ -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);
 	}