房间日奖励-首页-我的奖励-修改计算规则
This commit is contained in:
@@ -233,8 +233,7 @@ public class RoomDaySendRankRewardManager {
|
||||
long myReward = 0L;
|
||||
if (top10SerialValue.compareTo(BigDecimal.ZERO) > 0 && rewardInfoVo.getTopTenReward() > 0L){
|
||||
BigDecimal ratio = vo.getScore().divide(top10SerialValue, 2, RoundingMode.HALF_DOWN);
|
||||
myReward = ratio.compareTo(BigDecimal.ZERO) <= 0 ? 0L:
|
||||
BigDecimal.valueOf(rewardInfoVo.getTopTenReward()).divide(ratio, 0, RoundingMode.HALF_DOWN).longValue();
|
||||
myReward = ratio.multiply(BigDecimal.valueOf(rewardInfoVo.getTopTenReward())).longValue();
|
||||
}
|
||||
vo.setMyReward(myReward);
|
||||
|
||||
|
@@ -33,8 +33,8 @@ public class RoomDaySendRankRewardService extends ServiceImpl<RoomDaySendRankRew
|
||||
public RoomDaySendRankRewardHomeVo.RewardInfoVo buildBySerialValue(BigDecimal roomSerialValue) {
|
||||
RoomDaySendRankRewardHomeVo.RewardInfoVo vo = new RoomDaySendRankRewardHomeVo.RewardInfoVo();
|
||||
vo.setSerialValue(roomSerialValue);
|
||||
vo.setCurLevel("-");
|
||||
vo.setNextLevel("-");
|
||||
vo.setCurLevel("Lv0");
|
||||
vo.setNextLevel("Lv0");
|
||||
vo.setNextLevelLimit(BigDecimal.ZERO);
|
||||
vo.setNextLevelReward(0L);
|
||||
vo.setOwnerReward(0L);
|
||||
@@ -84,11 +84,8 @@ public class RoomDaySendRankRewardService extends ServiceImpl<RoomDaySendRankRew
|
||||
Optional<RoomDaySendRankReward> curLevelOptional = rewardList.stream()
|
||||
.filter(reward -> roomSerialValue.compareTo(reward.getSerialValue()) >= 0)
|
||||
.max(Comparator.comparing(RoomDaySendRankReward::getSerialValue));
|
||||
if (curLevelOptional.isEmpty()){
|
||||
return null;
|
||||
}
|
||||
return curLevelOptional.orElse(null);
|
||||
|
||||
return curLevelOptional.get();
|
||||
}
|
||||
|
||||
}
|
@@ -62,6 +62,7 @@ public class RoomRankingController {
|
||||
room.put("erbanNo", user.getErbanNo());
|
||||
room.put("nick", user.getNick());
|
||||
room.put("avatar", user.getAvatar());
|
||||
room.put("partitionId", user.getPartitionId());
|
||||
Map<String, Object> data = Maps.newHashMap();
|
||||
data.put("room", room);
|
||||
data.put("rankings", rankingVoList);
|
||||
|
Reference in New Issue
Block a user