From de4110d3d3944ffcd797fd8c43f0d455cc731f84 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 17 五月 2020 11:43:52 +0800
Subject: [PATCH] 活动详情
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
index 5bc7bf4..55d5e28 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
@@ -23,6 +23,8 @@
import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl;
import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;
+import com.yeshi.fanli.entity.bus.homemodule.CommonShareInfo;
+import com.yeshi.fanli.entity.bus.homemodule.CommonShareInfo.CommonShareInfoEnum;
import com.yeshi.fanli.entity.bus.homemodule.SwiperBanner;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.common.JumpDetailV2;
@@ -33,11 +35,13 @@
import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
import com.yeshi.fanli.service.inter.homemodule.AdActivityVersionControlService;
+import com.yeshi.fanli.service.inter.homemodule.CommonShareInfoService;
import com.yeshi.fanli.service.inter.homemodule.SwiperBannerService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -72,6 +76,10 @@
@Resource
private AdActivityVersionControlService adActivityVersionControlService;
+
+ @Resource
+ private CommonShareInfoService commonShareInfoService;
+
/**
* 鏂板
@@ -329,7 +337,7 @@
}
try {
- List<SwiperPicture> list = swiperPictureService.queryByBannerID((pageIndex - 1) * pageSize, pageSize,
+ List<BannerVO> list = swiperPictureService.queryByBannerID((pageIndex - 1) * pageSize, pageSize,
bannerId);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
@@ -338,7 +346,7 @@
// 璺宠浆閾炬帴
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
- for (SwiperPicture swiperPicture : list) {
+ for (BannerVO swiperPicture : list) {
if (swiperPicture.getState() != null && swiperPicture.getState() == 0) {
swiperPicture.setState(1);
} else {
@@ -377,6 +385,21 @@
jumpDetailV2.setName("-鏈�夋嫨-");
jumpDetailV2.setType("default");
swiperPicture.setJumpDetail(jumpDetailV2);
+ }
+
+ // 鍒嗕韩琛ュ厖淇℃伅
+ CommonShareInfo info = commonShareInfoService.getByPidAndType(swiperPicture.getId(),
+ CommonShareInfoEnum.banner.name());
+ if (info == null) {
+ swiperPicture.setNeedSpin(false);
+ swiperPicture.setComment("");
+ } else {
+ swiperPicture.setNeedSpin(info.getNeedSpin());
+ if (StringUtil.isNullOrEmpty(info.getComment())) {
+ swiperPicture.setComment("");
+ } else {
+ swiperPicture.setComment(info.getComment());
+ }
}
}
@@ -432,15 +455,15 @@
* @param out
*/
@RequestMapping(value = "savePicInfo")
- public void savePicInfo(String callback, SwiperPicture record, String jumpType, HttpServletRequest request,
- PrintWriter out) {
+ public void savePicInfo(String callback, SwiperPicture record, String jumpType, CommonShareInfo extra,
+ HttpServletRequest request, PrintWriter out) {
try {
// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
if (request instanceof MultipartHttpServletRequest) {
MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
- swiperPictureService.saveObject(fileRequest.getFile("file"), record, jumpType);
+ swiperPictureService.saveObject(fileRequest.getFile("file"), record, jumpType, extra);
} else {
- swiperPictureService.saveObject(null, record, jumpType);
+ swiperPictureService.saveObject(null, record, jumpType, extra);
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
--
Gitblit v1.8.0