From df4441322e9801c102299451da41d7c40b4502e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 六月 2021 18:53:13 +0800
Subject: [PATCH] zookeeper地址修改，Maven采用私服
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java
index ba46bb0..2cf402d 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java
@@ -63,16 +63,16 @@
public String getRankList(AcceptData acceptData, Long activityId, int page) {
List<ActivityJoinerRankInfoVO> voList = new ArrayList<>();
- List<ActivityJoinerRankInfo> list = luckyActivityJoinService.getWeightRankList(activityId, page,10);
+ List<ActivityJoinerRankInfo> list = luckyActivityJoinService.getWeightRankList(activityId, page, 10);
if (list != null && list.size() > 0) {
Map<Long, UserInfo> userInfoMap = userInfoService.listUserInfoAsMap(UserInfoUtil.getBaseUserList(list));
for (ActivityJoinerRankInfo info : list) {
UserInfo user = userInfoMap.get(Long.parseLong(info.getUid()));
if (user != null) {
- if (user.getId().longValue() == acceptData.getUid()) {
- continue;
- }
+// if (user.getId().longValue() == acceptData.getUid()) {
+// continue;
+// }
voList.add(new ActivityJoinerRankInfoVO(new SimpleUser(user.getId(), user.getNickName(), user.getPortrait()), info.getRank(), info.getWeight()));
}
}
@@ -124,16 +124,10 @@
//鑾峰彇鎴戠殑鎺掕
ActivityJoinerRankInfo rank = luckyActivityJoinService.getMyWeightRank(activityId, acceptData.getApp().getId(), targetUid + "");
//鑾峰彇鎬讳汉鏁�
- long count = luckyActivityJoinService.countWeightRank(activityId);
- BigDecimal percent = new BigDecimal(rank.getRank()).divide(new BigDecimal(count), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
- vo.setPercent(percent.intValue());
+ vo.setPercent(probability.getExceedPersonPercent());
- BigDecimal offset = null;
- if (average.compareTo(my) > 0) {
- offset = new BigDecimal(0).subtract(average.divide(my, 2, BigDecimal.ROUND_HALF_UP));
- } else {
- offset = my.divide(average, 2, BigDecimal.ROUND_HALF_UP);
- }
+ BigDecimal offset = my.divide(average, 2, BigDecimal.ROUND_HALF_UP);
+
vo.setOffset(offset);
--
Gitblit v1.8.0