From e0d4647635dd7ca974e2f147da254e8cefe6821a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 16 十二月 2020 18:27:10 +0800
Subject: [PATCH] 商品列表,商品详情接口完善
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java | 89 +++++++++++++++++++++++---------------------
1 files changed, 46 insertions(+), 43 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java
index db54b72..a669bf6 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java
@@ -1,19 +1,15 @@
package com.ks.daylucky.controller.api.client;
-import com.ks.daylucky.pojo.DO.ActivityTag;
-import com.ks.daylucky.pojo.DO.UserInfo;
import com.ks.daylucky.pojo.VO.AcceptData;
-import com.ks.daylucky.pojo.VO.ActivityDetailInfoVO;
-import com.ks.daylucky.pojo.VO.SimpleUser;
+import com.ks.daylucky.pojo.DTO.ActivityDetailInfoDTO;
+import com.ks.daylucky.service.ActivityService;
import com.ks.daylucky.service.ActivityTagService;
import com.ks.daylucky.service.UserInfoService;
import com.ks.daylucky.util.Constant;
-import com.ks.daylucky.util.UserInfoUtil;
import com.ks.lucky.pojo.DO.LuckyActivity;
-import com.ks.lucky.pojo.DO.LuckyActivityJoinRecord;
-import com.ks.lucky.pojo.DTO.ActivitySimpleUser;
import com.ks.lucky.remote.service.LuckyActivityJoinService;
import com.ks.lucky.remote.service.LuckyActivityService;
+import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -22,7 +18,6 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
@Controller
@RequestMapping("api/client/activity")
@@ -40,49 +35,57 @@
@Resource
private UserInfoService userInfoService;
+ @Resource
+ private ActivityService activityService;
+
+ /**
+ * 鑾峰彇娲诲姩璇︽儏
+ *
+ * @param acceptData
+ * @param activityId
+ * @return
+ */
@ResponseBody
@RequestMapping("getActivityDetail")
public String getActivityDetail(AcceptData acceptData, Long activityId) {
-
- ActivityDetailInfoVO vo = new ActivityDetailInfoVO();
-
- LuckyActivity actiivty = luckyActivityService.getActivityDetail(activityId);
- //鑾峰彇tag
- List<ActivityTag> tagList = activityTagService.getTagList(activityId);
-
- //鑾峰彇鍙備笌鑰呮暟閲�
- long count = luckyActivityJoinService.countWeightRank(activityId);
-
- //鑾峰彇鏈�杩戠殑鍙備笌鑰呭垪琛�
- List<SimpleUser> userList = new ArrayList<>();
- luckyActivityJoinService.getJoinerList(activityId, 1, 20);
- List<ActivitySimpleUser> list = luckyActivityJoinService.getJoinerList(activityId, 1, 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());
- if (user != null) {
- userList.add(new SimpleUser(user.getId(), user.getNickName(), user.getPortrait()));
- }
- }
+ ActivityDetailInfoDTO vo = activityService.getActivityDetail(activityId, acceptData.getApp().getId(), acceptData.getUid(), true, 20, false);
+ if (vo == null) {
+ return JsonUtil.loadFalseResult("娲诲姩涓嶅瓨鍦�");
}
-
- //鑾峰彇鏄惁鍙傚姞
- LuckyActivityJoinRecord record = luckyActivityJoinService.getJoinInfo(activityId, acceptData.getApp().getId(), acceptData.getUid() + "");
-
- boolean join = false;
- if (record != null) {
- join = true;
- }
-
- vo.setActivity(actiivty);
- vo.setJoin(join);
- vo.setJoinerList(userList);
- vo.setTagList(tagList);
return JsonUtil.loadTrueResult(vo);
}
+ /**
+ * 鑾峰彇鎺ㄨ崘娲诲姩鍒楄〃
+ *
+ * @param acceptData
+ * @param page
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping("getRecommendActivity")
+ public String getRecommendActivity(AcceptData acceptData, int page) {
+ List<LuckyActivity> list = luckyActivityService.getRecommendActivity(acceptData.getApp().getId(), acceptData.getUid() + "", page, Constant.PAGE_SIZE);
+ long count = luckyActivityService.getRecommendActivityCount(acceptData.getApp().getId(), acceptData.getUid() + "");
+
+ List<Long> activityIds = new ArrayList<>();
+ if (list != null && list.size() > 0) {
+ for (LuckyActivity activity : list) {
+ activityIds.add(activity.getId());
+ }
+ }
+ List<ActivityDetailInfoDTO> voList = activityService.getActivityDetail(activityIds, acceptData.getApp().getId(), acceptData.getUid(), false);
+
+
+
+ JSONObject data = new JSONObject();
+ data.put("data", voList);
+ data.put("count", count);
+ return JsonUtil.loadTrueResult(data);
+ }
+
+
}
--
Gitblit v1.8.0