From 3e7debeb2b7e5e77d19bac5edae1334c6c88839c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 07 十二月 2020 14:04:59 +0800
Subject: [PATCH] 天天抽奖接口完善
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java | 82 +++++++++++++++++++++++++++++++++++++----
1 files changed, 74 insertions(+), 8 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 c99cc09..25ed6ce 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
@@ -1,17 +1,15 @@
package com.ks.daylucky.controller.api.client;
import com.ks.daylucky.pojo.DO.UserInfo;
-import com.ks.daylucky.pojo.VO.AcceptData;
-import com.ks.daylucky.pojo.VO.ActivityJoinerRankInfoVO;
-import com.ks.daylucky.pojo.VO.DrawnProbabilityVO;
-import com.ks.daylucky.pojo.VO.SimpleUser;
+import com.ks.daylucky.pojo.VO.*;
+import com.ks.daylucky.service.ActivityService;
import com.ks.daylucky.service.UserInfoService;
import com.ks.daylucky.util.Constant;
import com.ks.daylucky.util.UserInfoUtil;
-import com.ks.lucky.pojo.DTO.ActivityDrawnProbabilityStatistic;
-import com.ks.lucky.pojo.DTO.ActivityJoinStatisticInfo;
-import com.ks.lucky.pojo.DTO.ActivityJoinerRankInfo;
-import com.ks.lucky.pojo.DTO.ActivitySimpleUser;
+import com.ks.lucky.exception.LuckyActivityException;
+import com.ks.lucky.exception.LuckyActivityJoinException;
+import com.ks.lucky.pojo.DTO.*;
+import com.ks.lucky.remote.service.LuckyActivityAwardResultService;
import com.ks.lucky.remote.service.LuckyActivityJoinService;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
@@ -33,7 +31,13 @@
private LuckyActivityJoinService luckyActivityJoinService;
@Resource
+ private LuckyActivityAwardResultService luckyActivityAwardResultService;
+
+ @Resource
private UserInfoService userInfoService;
+
+ @Resource
+ private ActivityService activityService;
/**
@@ -165,5 +169,67 @@
return JsonUtil.loadTrueResult(data);
}
+ /**
+ * 鑾峰彇鎶藉璁板綍
+ *
+ * @param acceptData
+ * @param type 1-寰呭紑濂� 2-宸蹭腑濂� 3-鏈腑濂�
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping("getJoinRecord")
+ public String getJoinRecord(AcceptData acceptData, int type, int page) {
+ List<Long> activityIdList = new ArrayList<>();
+ long count = 0;
+ Long appId = acceptData.getApp().getId();
+ Long uid = acceptData.getUid();
+ switch (type) {
+ case 1:
+ activityIdList = luckyActivityJoinService.getUnOpenActivityIdList(appId, uid + "", page, Constant.PAGE_SIZE);
+ count = luckyActivityJoinService.countUnOpenActivityIdList(appId, uid + "");
+ break;
+ case 2:
+ activityIdList = luckyActivityAwardResultService.getDrawnActivityIdList(appId, uid + "", page, Constant.PAGE_SIZE);
+ count = luckyActivityAwardResultService.countDrawnActivityIdList(appId, uid + "");
+ break;
+ case 3:
+ activityIdList = luckyActivityJoinService.getUnDrawnActivityIdList(appId, uid + "", page, Constant.PAGE_SIZE);
+ count = luckyActivityJoinService.countUnDrawnActivityIdList(appId, uid + "");
+ break;
+ }
+
+ List<ActivityDetailInfoVO> voList = activityService.getActivityDetail(activityIdList, appId, uid, type == 2 ? true : false);
+
+ JSONObject data = new JSONObject();
+ data.put("data", JsonUtil.getApiCommonGson().toJson(voList));
+ data.put("count", count);
+
+ return JsonUtil.loadTrueResult(data);
+ }
+
+ @ResponseBody
+ @RequestMapping("join")
+ public String join(AcceptData acceptData, Long activityId) {
+ UserInfo userInfo = userInfoService.getUserDetail(acceptData.getUid());
+ if (userInfo == null) {
+ return JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�");
+ }
+
+ JoinInfo joinInfo = new JoinInfo();
+ joinInfo.setAlipayUid(userInfo.getAlipayUid());
+ try {
+ int weight = 1;
+ luckyActivityJoinService.join(activityId, acceptData.getApp().getId(), acceptData.getUid() + "", 1, joinInfo);
+
+ //TODO 鎶藉娲诲姩鐨勭被鍨嬮渶瑕佹浛鎹�
+ return JsonUtil.loadTrueResult(new JoinResultInfoVO(weight, String.format("娲诲姩鏈熷彿锛歂O.%s\n鎶藉娲诲姩", activityId)));
+ } catch (LuckyActivityException e) {
+ return JsonUtil.loadFalseResult(e.getMsg());
+ } catch (LuckyActivityJoinException e) {
+ return JsonUtil.loadFalseResult(e.getMsg());
+ }
+
+ }
+
}
--
Gitblit v1.8.0