From 7e389247b3b2877c12f1eaae6e33c9c33e91d2dd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 08 一月 2021 18:41:59 +0800
Subject: [PATCH] 活动添加后台完善
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java | 69 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 17 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 8830d89..96904f7 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
@@ -2,15 +2,14 @@
import com.ks.daylucky.pojo.DO.ActivityScanRecord;
import com.ks.daylucky.pojo.DO.AppConfig;
-import com.ks.daylucky.pojo.VO.ActivityShareInfoVO;
-import com.ks.daylucky.pojo.DTO.AssistJoinInfoDTO;
+import com.ks.daylucky.pojo.VO.AlipayXCXShareInfoVO;
import com.ks.daylucky.pojo.DTO.ConfigKeyEnum;
import com.ks.daylucky.pojo.VO.AcceptData;
import com.ks.daylucky.pojo.DTO.ActivityDetailInfoDTO;
import com.ks.daylucky.pojo.VO.ActivityDetailVO;
+import com.ks.daylucky.pojo.VO.SimpleUser;
import com.ks.daylucky.service.*;
import com.ks.daylucky.util.Constant;
-import com.ks.daylucky.util.RSAUtil;
import com.ks.daylucky.util.activity.ActivityUtil;
import com.ks.daylucky.util.factory.vo.ActivityDetailVOFactory;
import com.ks.daylucky.util.factory.vo.ActivityListItemInfoVOFactory;
@@ -23,21 +22,20 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.encrypt.AESUtil;
import javax.annotation.Resource;
-import java.security.AccessControlContext;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
@Controller
@RequestMapping("api/client/activity")
public class ActivityController {
- @Reference(version = "1.0.0")
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityService luckyActivityService;
- @Reference(version = "1.0.0")
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityJoinAssistService luckyActivityJoinAssistService;
@Resource
@@ -48,6 +46,15 @@
@Resource
private AppConfigService appConfigService;
+
+ @Resource
+ private ActivityExtraInfoService activityExtraInfoService;
+
+ @Resource
+ private UserActivityExtraInfoService userActivityExtraInfoService;
+
+ @Resource
+ private UserInfoService userInfoService;
/**
@@ -60,7 +67,7 @@
@ResponseBody
@RequestMapping("getActivityDetail")
public String getActivityDetail(AcceptData acceptData, Long activityId) {
- ActivityDetailInfoDTO dto = activityService.getActivityDetail(activityId, acceptData.getApp().getId(), acceptData.getUid(), true, 20, false);
+ ActivityDetailInfoDTO dto = activityService.getActivityDetail(activityId, acceptData.getApp().getId(), acceptData.getUid(), true, 8, false);
if (dto == null) {
return JsonUtil.loadFalseResult("娲诲姩涓嶅瓨鍦�");
}
@@ -81,12 +88,39 @@
//鍒嗕韩淇℃伅
- ActivityShareInfoVO shareInfoDTO = new ActivityShareInfoVO();
+ String activityShareImage = null;
+ try {
+ activityShareImage = activityExtraInfoService.getShareImageLink(activityId, vo.getActivity().getAwardList(), acceptData.getApp().getId());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ AlipayXCXShareInfoVO shareInfoDTO = new AlipayXCXShareInfoVO();
shareInfoDTO.setPath(String.format("/pages/activity-detail/activity-detail?id=%s&joinInfo=%s", activityId, ActivityUtil.getShareJoinInfo(acceptData.getUid(), activityId)));
shareInfoDTO.setTitle("娴嬭瘯鏍囬");
shareInfoDTO.setDesc("娴嬭瘯绠�浠�");
-// shareInfoDTO.setBgImgUrl();
+ shareInfoDTO.setBgImgUrl(activityShareImage);
vo.setShareInfo(shareInfoDTO);
+
+ //宸茬粡鍔犲叆娲诲姩灏遍渶瑕佽繑鍥炲姪鍔涘垎浜浘
+ if (vo.isJoined()) {
+ SimpleUser user = userInfoService.getSimpleUser(acceptData.getUid());
+ if (user != null) {
+ String assistShareImage = null;
+ try {
+ assistShareImage = userActivityExtraInfoService.getShareImageLink(activityId, user, acceptData.getApp().getId());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ shareInfoDTO = new AlipayXCXShareInfoVO();
+ shareInfoDTO.setPath(String.format("/pages/activity-detail/activity-detail?id=%s&joinInfo=%s", activityId, ActivityUtil.getShareJoinInfo(acceptData.getUid(), activityId)));
+ shareInfoDTO.setTitle("娴嬭瘯鏍囬");
+ shareInfoDTO.setDesc("娴嬭瘯绠�浠�");
+ shareInfoDTO.setBgImgUrl(assistShareImage);
+ vo.setAssistShareInfo(shareInfoDTO);
+ }
+ }
//鍔犲叆娴忚璁板綍
@@ -124,10 +158,10 @@
}
List<ActivityDetailInfoDTO> dtoList = activityService.getActivityDetail(activityIds, acceptData.getApp().getId(), acceptData.getUid(), false);
- //TODO 娴嬭瘯
- for (int i = 0; i < 20; i++) {
- dtoList.add(dtoList.get(0));
- }
+// //TODO 娴嬭瘯
+// for (int i = 0; i < 20; i++) {
+// dtoList.add(dtoList.get(0));
+// }
JSONObject data = new JSONObject();
data.put("data", JsonUtil.getSimpleGson().toJson(ActivityListItemInfoVOFactory.create(dtoList)));
@@ -145,10 +179,11 @@
*/
@ResponseBody
@RequestMapping("getSponsorActivity")
- public String getSponsorActivity(AcceptData acceptData, Long sponsorId, int page) {
+ public String getSponsorActivity(AcceptData acceptData, Long sponsorId, Long activityId, int page) {
- List<LuckyActivity> list = luckyActivityService.getActivityList(acceptData.getApp().getId(), sponsorId, getCanShowStateList(), null, page, Constant.CLIENT_ACTIVITY_LIST_PAGE_SIZE);
- long count = luckyActivityService.countActivity(acceptData.getApp().getId(), sponsorId, getCanShowStateList(), null);
+ List<LuckyActivity> list = luckyActivityService.getActivityList(acceptData.getApp().getId(), sponsorId, getCanShowStateList(), Arrays.asList(new Long[]{activityId}),
+ null, page, Constant.CLIENT_ACTIVITY_LIST_PAGE_SIZE);
+ long count = luckyActivityService.countActivity(acceptData.getApp().getId(), sponsorId, getCanShowStateList(), null, Arrays.asList(new Long[]{activityId}));
List<Long> activityIds = new ArrayList<>();
if (list != null && list.size() > 0) {
--
Gitblit v1.8.0