From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
index d5876da..52819b9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
@@ -27,6 +27,7 @@
import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;
import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.common.JumpDetailV2;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.banner.SwiperPictureException;
import com.yeshi.fanli.exception.homemodule.HomeNavbarException;
import com.yeshi.fanli.exception.homemodule.SpecialException;
@@ -38,6 +39,7 @@
import com.yeshi.fanli.service.inter.homemodule.SpecialPlaceService;
import com.yeshi.fanli.service.inter.homemodule.SpecialService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.VersionUtil;
@@ -96,6 +98,8 @@
record.setParams(null);
} else if (!StringUtil.isJson(params)) {
throw new SpecialException(1, "璺宠浆鍙傛暟闈濲SON鏍煎紡");
+ } else {
+ record.setParams(params.trim());
}
String startTime_str = record.getStartTime_str();
@@ -265,7 +269,7 @@
String type = contentType.substring(contentType.indexOf("/") + 1);
// 鏂囦欢璺緞
- String filePath = "/img/special/" + UUID.randomUUID().toString().replace("-", "") + "." + type;
+ String filePath =FilePathEnum.special.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;
// 鎵ц涓婁紶
String fileLink = COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
@@ -285,7 +289,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void updateOrder(Long id, Integer moveType, Integer sex) throws SpecialException {
if (id == null || moveType == null || (!moveType.equals(1) && !moveType.equals(-1)) || sex == null) {
@@ -337,7 +341,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int deleteBatchByPrimaryKey(List<Long> list) throws Exception {
List<Special> listSpecial = specialMapper.queryByListPrimaryKey(list);
for (Special special : listSpecial) {
@@ -351,6 +355,15 @@
COSManager.getInstance().deleteFile(subPicture);
}
}
+
+ if (listSpecial != null)
+ for (Special special : listSpecial) {
+ List<AdActivityVersionControl> versionList = adActivityVersionControlService
+ .listByTypeAndSourceId(AdActivityType.special, special.getId());
+ if (versionList != null)
+ for (AdActivityVersionControl control : versionList)
+ adActivityVersionControlService.deleteByPrimaryKey(control.getId());
+ }
return specialMapper.deleteBatchByPrimaryKey(list);
}
@@ -448,8 +461,10 @@
@Override
@Cacheable(value = "specialCache", key = "'listByVersion-'+#start+'-'+#count+'-'+#card+'-'+#platform+'-'+#versionCode")
- public List<Special> listByVersion(long start, int count, String card, Integer platform, Integer versionCode) {
- return specialMapper.listByVersion(start, count, card, platform, versionCode);
+ public List<Special> listByVersion(long start, int count, String card, String platform, Integer versionCode) {
+ List<Special> specialList = specialMapper.listByPlaceKey(card, null, null, null);
+ filterSpecial(specialList, platform, versionCode);
+ return specialList;
}
/**
@@ -531,7 +546,7 @@
if (hour < 6) {// 0-6鐐逛箣闂翠笉杩涘叆鑷喘绔嬪噺鐨勯〉闈�
s.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
JSONObject params = new JSONObject();
- params.put("url", configService.get("tlj_own_buy_nogoods"));
+ params.put("url", configService.get(ConfigKeyEnum.tljOwnBuyNogoods.getKey()));
s.setParams(params.toString());
} else {
// 鏌ヨ涓撻璇︽儏
--
Gitblit v1.8.0