From 478e6722fd36bf9b5d8608c8cca2000190da5496 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 22 十二月 2020 19:16:15 +0800
Subject: [PATCH] 功能完善
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAwardsController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAwardsController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAwardsController.java
index 39ab9ab..2d91fb5 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAwardsController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAwardsController.java
@@ -2,11 +2,13 @@
import com.ks.daylucky.pojo.DO.UserInfo;
import com.ks.daylucky.pojo.VO.AcceptData;
+import com.ks.daylucky.pojo.VO.ActivityAwardVO;
import com.ks.daylucky.pojo.VO.SimpleUser;
import com.ks.daylucky.pojo.VO.UserActivityUnRecievedAwardVO;
import com.ks.daylucky.service.UserInfoService;
import com.ks.daylucky.util.Constant;
import com.ks.daylucky.util.UserInfoUtil;
+import com.ks.daylucky.util.factory.vo.ActivityListItemInfoVOFactory;
import com.ks.lucky.exception.LuckyActivityAwardException;
import com.ks.lucky.exception.LuckyActivityAwardResultException;
import com.ks.lucky.exception.LuckyActivityException;
@@ -54,9 +56,13 @@
public String getDrawnInfo(AcceptData acceptData, Long activityId, int count) {
List<LuckyActivityAwards> list = luckyActivityAwardService.getAwardList(activityId);
JSONArray array = new JSONArray();
+ int p = 0;
for (LuckyActivityAwards award : list) {
+ award = luckyActivityAwardService.getAwardDetail(award.getId());
JSONObject item = new JSONObject();
List<LuckyActivityAwardResult> awardResults = luckyActivityAwardResultService.getResultListWithAwardInfo(activityId, award.getId(), 1, count);
+ long resultCount = luckyActivityAwardResultService.countResultWithAwardInfo(activityId, award.getId());
+
List<SimpleUser> userList = new ArrayList<>();
Map<Long, UserInfo> userMap = userInfoService.listUserInfoAsMap(UserInfoUtil.getBaseUserList(awardResults));
for (LuckyActivityAwardResult info : awardResults) {
@@ -66,7 +72,8 @@
}
}
item.put("userList", userList);
- item.put("award", JsonUtil.getApiCommonGson().toJson(award));
+ item.put("userCount", resultCount);
+ item.put("award", ActivityListItemInfoVOFactory.create(award, p++));
array.add(item);
}
--
Gitblit v1.8.0