From 5405154d6979f1b50ce2d881bb164b1acca80b6d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 一月 2021 18:58:18 +0800
Subject: [PATCH] 修改相关bug
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 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 bcc7eee..59f0ff3 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,7 +1,9 @@
package com.ks.daylucky.controller.api.client;
+import com.google.gson.Gson;
import com.ks.daylucky.pojo.DO.ActivityScanRecord;
import com.ks.daylucky.pojo.DO.AppConfig;
+import com.ks.daylucky.pojo.DTO.SimpleShareInfo;
import com.ks.daylucky.pojo.VO.AlipayXCXShareInfoVO;
import com.ks.daylucky.pojo.DTO.ConfigKeyEnum;
import com.ks.daylucky.pojo.VO.AcceptData;
@@ -24,17 +26,19 @@
import org.yeshi.utils.JsonUtil;
import javax.annotation.Resource;
+import java.net.URLEncoder;
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",check = false)
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityService luckyActivityService;
- @Reference(version = "1.0.0",check = false)
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityJoinAssistService luckyActivityJoinAssistService;
@Resource
@@ -66,7 +70,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("娲诲姩涓嶅瓨鍦�");
}
@@ -94,16 +98,18 @@
e.printStackTrace();
}
+ AppConfig appConfig = appConfigService.getConfigCache(acceptData.getApp().getId(), ConfigKeyEnum.activityShareInfo, acceptData.getVersion());
+ SimpleShareInfo info = new Gson().fromJson(appConfig.getValue(), SimpleShareInfo.class);
+
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.setTitle(info.getTitle());
+ shareInfoDTO.setDesc(info.getDesc());
shareInfoDTO.setBgImgUrl(activityShareImage);
vo.setShareInfo(shareInfoDTO);
//宸茬粡鍔犲叆娲诲姩灏遍渶瑕佽繑鍥炲姪鍔涘垎浜浘
if (vo.isJoined()) {
-
SimpleUser user = userInfoService.getSimpleUser(acceptData.getUid());
if (user != null) {
String assistShareImage = null;
@@ -112,11 +118,10 @@
} 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.setPath(String.format("/pages/activity-detail/activity-detail?id=%s&joinInfo=%s", activityId, URLEncoder.encode(ActivityUtil.getShareJoinInfo(acceptData.getUid(), activityId))));
+ shareInfoDTO.setTitle(info.getTitle());
+ shareInfoDTO.setDesc(info.getDesc());
shareInfoDTO.setBgImgUrl(assistShareImage);
vo.setAssistShareInfo(shareInfoDTO);
}
@@ -158,11 +163,6 @@
}
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));
- }
-
JSONObject data = new JSONObject();
data.put("data", JsonUtil.getSimpleGson().toJson(ActivityListItemInfoVOFactory.create(dtoList)));
data.put("count", count);
@@ -179,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