From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 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 aa7743d..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
@@ -98,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();
@@ -267,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();
@@ -287,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) {
@@ -353,7 +355,7 @@
COSManager.getInstance().deleteFile(subPicture);
}
}
-
+
if (listSpecial != null)
for (Special special : listSpecial) {
List<AdActivityVersionControl> versionList = adActivityVersionControlService
@@ -553,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