From 8c1c003c60d2f27b3c55e248451caeec7f2b5631 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 28 一月 2021 19:06:28 +0800
Subject: [PATCH] 活动管理界面完善
---
service-daylucky/src/main/java/com/ks/daylucky/controller/admin/AdminActivityController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/admin/AdminActivityController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/admin/AdminActivityController.java
index 91bec96..7c71e69 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/admin/AdminActivityController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/admin/AdminActivityController.java
@@ -2,8 +2,11 @@
import com.google.gson.Gson;
import com.ks.daylucky.pojo.DO.ActivityExtraInfo;
+import com.ks.daylucky.pojo.DO.ActivityTag;
import com.ks.daylucky.pojo.VO.admin.ActivityAdminVo;
import com.ks.daylucky.service.ActivityExtraInfoService;
+import com.ks.daylucky.service.ActivityTagService;
+import com.ks.daylucky.util.factory.vo.ActivityAdminVoFactory;
import com.ks.daylucky.util.factory.vo.LuckyActivityFactory;
import com.ks.lib.common.exception.ParamsException;
import com.ks.lucky.exception.*;
@@ -19,6 +22,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
+import java.util.List;
@Controller
@RequestMapping("/admin/activity")
@@ -30,6 +34,8 @@
@Resource
private ActivityExtraInfoService activityExtraInfoService;
+ @Resource
+ private ActivityTagService activityTagService;
/**
* 娣诲姞娲诲姩
@@ -43,7 +49,7 @@
public String addActivity(HttpServletRequest request, String data, String type) {
ActivityAdminVo vo = new Gson().fromJson(data, ActivityAdminVo.class);
Long sponsorId = 1L;
- Long appId = 4L;
+ Long appId = 5L;
LuckyActivity activity = LuckyActivityFactory.create(sponsorId, vo);
activity.setAppId(appId);
try {
@@ -51,6 +57,10 @@
ActivityExtraInfo extraInfo = LuckyActivityFactory.getActivityExtra(vo.getOpenInfo());
extraInfo.setActivityId(activityId);
activityExtraInfoService.add(extraInfo);
+ //鎻愬彇Tags
+ if (vo.getActivity().getTags() != null && vo.getActivity().getTags().size() > 0) {
+ activityTagService.setTags(activityId, (vo.getActivity().getTags()));
+ }
switch (type) {
//淇濆瓨
@@ -98,8 +108,15 @@
return JsonUtil.loadFalseResult("娣诲姞鍑洪敊");
}
-
-
+ @ResponseBody
+ @RequestMapping("getActivityDetail")
+ public String getActivityDetail(HttpServletRequest request, Long id) {
+ LuckyActivity activity = luckyActivityService.getActivityDetail(id);
+ List<ActivityTag> tagList = activityTagService.getTagList(id);
+ ActivityExtraInfo info = activityExtraInfoService.getDetail(activity.getId());
+ ActivityAdminVo bean = ActivityAdminVoFactory.create(activity, tagList, info.getValidDay());
+ return JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(bean));
+ }
}
--
Gitblit v1.8.0