From c6b718c3cadf5e5fff4c2a47fd1247842439f8c7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 10:45:18 +0800
Subject: [PATCH] 团队消息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 52819b9..984f532 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
@@ -269,7 +269,7 @@
String type = contentType.substring(contentType.indexOf("/") + 1);
// 鏂囦欢璺緞
- String filePath =FilePathEnum.special.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;
+ String filePath = FilePathEnum.special.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;
// 鎵ц涓婁紶
String fileLink = COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
@@ -289,7 +289,7 @@
}
@Override
- @Transactional(rollbackFor=Exception.class)
+ @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) {
@@ -355,7 +355,7 @@
COSManager.getInstance().deleteFile(subPicture);
}
}
-
+
if (listSpecial != null)
for (Special special : listSpecial) {
List<AdActivityVersionControl> versionList = adActivityVersionControlService
@@ -555,10 +555,16 @@
s.setParams(special.getParams());
}
}
+
+ if (s.getJumpDetail() != null) {
+ s.getJumpDetail().setNeedLogin(s.isJumpLogin()
+ | (s.getJumpDetail().getNeedLogin() != null && s.getJumpDetail().getNeedLogin()));
+ }
+
}
// 鏁版嵁澶勭悊
- handlelist(listArc);
+// handlelist(listArc);
arcMap.put("list", JsonUtil.getApiCommonGson().toJson(listArc));
// 棣栭〉-娲诲姩鍖哄煙锛堝コ鐜嬭妭锛�
--
Gitblit v1.8.0