From 25680e135b5bdc15658622cbfde74bab73cfee77 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 25 十二月 2020 18:54:40 +0800
Subject: [PATCH] 功能完善
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 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..bec03c6 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,10 +22,8 @@
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.List;
@@ -48,6 +45,15 @@
@Resource
private AppConfigService appConfigService;
+
+ @Resource
+ private ActivityExtraInfoService activityExtraInfoService;
+
+ @Resource
+ private UserActivityExtraInfoService userActivityExtraInfoService;
+
+ @Resource
+ private UserInfoService userInfoService;
/**
@@ -81,13 +87,41 @@
//鍒嗕韩淇℃伅
- 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);
+ }
+ }
+
//鍔犲叆娴忚璁板綍
ActivityScanRecord record = new ActivityScanRecord();
--
Gitblit v1.8.0