From 8c1c003c60d2f27b3c55e248451caeec7f2b5631 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 28 一月 2021 19:06:28 +0800
Subject: [PATCH] 活动管理界面完善
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 eee2ce6..a628a92 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.0")
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityJoinService luckyActivityJoinService;
- @Reference(version = "1.0.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,16 +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(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()));
}
}
@@ -147,7 +154,7 @@
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) {
@@ -226,10 +233,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