From bb07147aaa96d1ef4c99e358dbbe7dad160dc62a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:43:23 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java
index 39603e7..e45b8f1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java
@@ -214,7 +214,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int deleteBatchByPrimaryKey(List<Long> list) throws SwiperPictureException {
List<SwiperPicture> listSwiper = swiperPictureMapper.queryByListPrimaryKey(list);
@@ -225,6 +225,14 @@
}
}
+ if (listSwiper != null)
+ for (SwiperPicture picture : listSwiper) {
+ List<AdActivityVersionControl> versionList = adActivityVersionControlService
+ .listByTypeAndSourceId(AdActivityType.banner, picture.getId());
+ if (versionList != null)
+ for (AdActivityVersionControl control : versionList)
+ adActivityVersionControlService.deleteByPrimaryKey(control.getId());
+ }
return swiperPictureMapper.deleteBatchByPrimaryKey(list);
}
@@ -301,6 +309,12 @@
public List<SwiperPicture> getByBannerCardAndVersion(String card, String platform, int version) {
List<SwiperPicture> list = swiperPictureMapper.getByBannerCard(card);
filterSwipePicture(list, platform, version);
+ for (SwiperPicture picture : list) {
+ if (picture.isJumpNeedLogin() && picture.getJumpDetail() != null) {
+ picture.getJumpDetail().setNeedLogin(true);
+ }
+ }
+
return list;
}
--
Gitblit v1.8.0