zoujiajian 2 роки тому
батько
коміт
214f861072

+ 0 - 1
netflix-dao/src/main/resources/mapper/UserDistributeRankStatisticsRecordMapper.xml

@@ -6,7 +6,6 @@
     <select id="selectDistributeRanks" resultType="com.cyksj.model.views.DistributeUserRankView">
         select ROW_NUMBER()                             OVER (ORDER BY ${filed} desc) AS rank_id, concat(LEFT(ifnull(u.nickname,udsr.nickname),1),'*', RIGHT(ifnull(u.nickname,udsr.nickname),1)) as nickname,
                ifnull(u.headimgurl, udsr.headimgurl) as headimgurl,
-               udsr.user_id,
                udsr.statistics_start_time,
                udsr.money,
                udsr.orders,

+ 3 - 7
netflix-web/src/main/java/com/cyksj/web/controller/distribute/DistributeRankController.java

@@ -105,6 +105,9 @@ public class DistributeRankController {
 			distributeUserRankView.setHeadimgurl(user.getHeadimgurl());
 			return distributeUserRankView;
 		});
+		if (self != null && self.getRankId() <= 10) {
+			self.setIsPrize(true);
+		}
 		distributeUserRankPersonalView.setSelf(self);
 
 		DistributeUserRankView more = userDistributeRankStatisticsRecordMapper.getMoreSelfRank(self.getRankId(), self.getOrders(), self.getMoney(), orderByField, statisticsTime);
@@ -117,13 +120,6 @@ public class DistributeRankController {
 		}
 
 		Page<DistributeUserRankView> ranks = userDistributeRankStatisticsRecordMapper.selectDistributeRanks(orderByField, statisticsTime, new Page<>(start, limit));
-		ranks.getRecords().forEach(rank->{
-			if (ObjectUtil.equal(userId, rank.getUserId())) {
-				//在前10
-				self.setIsPrize(true);
-				rank.setUserId(null);
-			}
-		});
 		distributeUserRankPersonalView.setRanks(ranks);
 		return GatewayResponse.SUCCESS.newBuilder().toResult(distributeUserRankPersonalView);
 	}