From df4441322e9801c102299451da41d7c40b4502e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 六月 2021 18:53:13 +0800
Subject: [PATCH] zookeeper地址修改，Maven采用私服
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 96904f7..2583d52 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;
@@ -13,6 +15,7 @@
import com.ks.daylucky.util.activity.ActivityUtil;
import com.ks.daylucky.util.factory.vo.ActivityDetailVOFactory;
import com.ks.daylucky.util.factory.vo.ActivityListItemInfoVOFactory;
+import com.ks.lib.common.exception.ParamsException;
import com.ks.lucky.pojo.DO.LuckyActivity;
import com.ks.lucky.remote.service.LuckyActivityJoinAssistService;
import com.ks.lucky.remote.service.LuckyActivityService;
@@ -24,6 +27,7 @@
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;
@@ -66,7 +70,7 @@
*/
@ResponseBody
@RequestMapping("getActivityDetail")
- public String getActivityDetail(AcceptData acceptData, Long activityId) {
+ public String getActivityDetail(AcceptData acceptData, Long activityId) throws ParamsException {
ActivityDetailInfoDTO dto = activityService.getActivityDetail(activityId, acceptData.getApp().getId(), acceptData.getUid(), true, 8, false);
if (dto == null) {
return JsonUtil.loadFalseResult("娲诲姩涓嶅瓨鍦�");
@@ -95,10 +99,13 @@
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);
@@ -112,11 +119,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);
}
@@ -157,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)));
--
Gitblit v1.8.0