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 | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 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 a47e647..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
@@ -7,12 +7,16 @@
import com.ks.daylucky.service.UserInfoService;
import com.ks.daylucky.util.Constant;
import com.ks.daylucky.util.UserInfoUtil;
+import com.ks.daylucky.util.activity.ActivityUtil;
import com.ks.daylucky.util.factory.vo.ActivityListItemInfoVOFactory;
import com.ks.lucky.exception.LuckyActivityException;
import com.ks.lucky.exception.LuckyActivityJoinException;
+import com.ks.lucky.pojo.DO.LuckyActivity;
+import com.ks.lucky.pojo.DO.LuckyActivityJoinRecord;
import com.ks.lucky.pojo.DTO.*;
import com.ks.lucky.remote.service.LuckyActivityAwardResultService;
import com.ks.lucky.remote.service.LuckyActivityJoinService;
+import com.ks.lucky.remote.service.LuckyActivityService;
import net.sf.json.JSONObject;
import org.apache.dubbo.config.annotation.Reference;
import org.springframework.stereotype.Controller;
@@ -30,11 +34,14 @@
@RequestMapping("api/client/activity/join")
public class ActivityJoinController {
- @Reference(version = "1.0")
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityJoinService luckyActivityJoinService;
- @Reference(version = "1.0")
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityAwardResultService luckyActivityAwardResultService;
+
+ @Reference(version = "1.0.0", check = false)
+ private LuckyActivityService luckyActivityService;
@Resource
private UserInfoService userInfoService;
@@ -56,12 +63,16 @@
public String getRankList(AcceptData acceptData, Long activityId, int page) {
List<ActivityJoinerRankInfoVO> voList = new ArrayList<>();
- List<ActivityJoinerRankInfo> list = luckyActivityJoinService.getWeightRankList(activityId, page, Constant.PAGE_SIZE);
+ 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(info.getUid());
+ UserInfo user = userInfoMap.get(Long.parseLong(info.getUid()));
+
if (user != null) {
+// if (user.getId().longValue() == acceptData.getUid()) {
+// continue;
+// }
voList.add(new ActivityJoinerRankInfoVO(new SimpleUser(user.getId(), user.getNickName(), user.getPortrait()), info.getRank(), info.getWeight()));
}
}
@@ -113,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);
@@ -143,11 +148,11 @@
public String getJoinerList(AcceptData acceptData, Long activityId, int page) {
List<SimpleUser> voList = new ArrayList<>();
- List<ActivitySimpleUser> list = luckyActivityJoinService.getJoinerList(activityId, page, Constant.PAGE_SIZE);
+ List<ActivitySimpleUser> list = luckyActivityJoinService.getJoinerList(activityId, null, page, Constant.PAGE_SIZE);
if (list != null && list.size() > 0) {
Map<Long, UserInfo> userInfoMap = userInfoService.listUserInfoAsMap(UserInfoUtil.getBaseUserList(list));
for (ActivitySimpleUser info : list) {
- UserInfo user = userInfoMap.get(info.getUid());
+ UserInfo user = userInfoMap.get(Long.parseLong(info.getUid()));
if (user != null) {
voList.add(new SimpleUser(user.getId(), user.getNickName(), user.getPortrait()));
}
@@ -204,7 +209,7 @@
List<ActivityDetailInfoDTO> voList = activityService.getActivityDetail(activityIdList, appId, uid, type == 2 ? true : false);
JSONObject data = new JSONObject();
- data.put("data", ActivityListItemInfoVOFactory.create(voList));
+ data.put("data", JsonUtil.getSimpleGson().toJson(ActivityListItemInfoVOFactory.create(voList)));
data.put("count", count);
return JsonUtil.loadTrueResult(data);
@@ -222,10 +227,11 @@
joinInfo.setAlipayUid(userInfo.getAlipayUid());
try {
int weight = 1;
- luckyActivityJoinService.join(activityId, acceptData.getApp().getId(), acceptData.getUid() + "", 1, joinInfo);
+ luckyActivityJoinService.join(activityId, acceptData.getApp().getId(), acceptData.getUid() + "", 1, joinInfo, LuckyActivityJoinRecord.USER_TYPE_REAL);
+ LuckyActivity activity = luckyActivityService.getActivity(activityId);
//TODO 鎶藉娲诲姩鐨勭被鍨嬮渶瑕佹浛鎹�
- return JsonUtil.loadTrueResult(new JoinResultInfoVO(weight, String.format("娲诲姩鏈熷彿锛歂O.%s\n鎶藉娲诲姩", activityId)));
+ return JsonUtil.loadTrueResult(new JoinResultInfoVO(weight, String.format("娲诲姩鏈熷彿锛�%s\n鎶藉娲诲姩", ActivityUtil.getActivityDateNumber(activityId, activity.getCreateTime()))));
} catch (LuckyActivityException e) {
return JsonUtil.loadFalseResult(e.getMsg());
} catch (LuckyActivityJoinException e) {
--
Gitblit v1.8.0