From 6c09cbd70388ae53ec593de253f69cfa1a3eeda7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 06 二月 2021 15:41:25 +0800
Subject: [PATCH] 活动管理界面完善

---
 service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java |   14 ++++----------
 1 files changed, 4 insertions(+), 10 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 a628a92..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,7 +63,7 @@
     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) {
@@ -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