From 1180be99c94b80d5fe9fea2877558fb29aa97427 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 18:21:02 +0800
Subject: [PATCH] 兼容拼多多、京东提交
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 781d20b..74fa190 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
@@ -8,10 +8,10 @@
import java.util.UUID;
import javax.annotation.Resource;
-import javax.transaction.Transactional;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.yeshi.utils.tencentcloud.COSManager;
@@ -80,6 +80,8 @@
String params = record.getParams();
if (params == null || params.trim().length() == 0 || "null".equalsIgnoreCase(params) ) {
record.setParams(null);
+ } else if (!StringUtil.isJson(params)) {
+ throw new SwiperPictureException(1, "璺宠浆鍙傛暟闈濲SON鏍煎紡");
}
if (!StringUtil.isNullOrEmpty(jumpType)) {
@@ -105,6 +107,11 @@
} catch (ParseException e) {
e.printStackTrace();
+ }
+
+ String remark = record.getRemark();
+ if (remark != null && (remark.trim().length() == 0 || remark.equalsIgnoreCase("null"))) {
+ record.setRemark(null);
}
@@ -221,7 +228,7 @@
@Override
- public List<SwiperPicture> getOrderByBannerID(Long bannerId, Integer type, Integer order) throws SwiperPictureException {
+ public List<SwiperPicture> getOrderByBannerID(Long bannerId, Integer type, Integer order) {
return swiperPictureMapper.getOrderByBannerID(bannerId, type, order);
}
@@ -232,7 +239,7 @@
@Override
@Cacheable(value = "bannerCache", key = "'getByBannerCard-'+#card")
- public List<SwiperPicture> getByBannerCard(String card) throws SwiperPictureException {
+ public List<SwiperPicture> getByBannerCard(String card) {
List<SwiperPicture> list = swiperPictureMapper.getByBannerCard(card);
if (list != null && list.size() > 0) {
for (SwiperPicture swiperPicture: list) {
@@ -250,7 +257,7 @@
@Override
@Cacheable(value = "bannerCache", key = "'getByBannerId-'+#bannerId")
- public List<SwiperPicture> getByBannerId(Long bannerId) throws SwiperPictureException {
+ public List<SwiperPicture> getByBannerId(Long bannerId) {
return swiperPictureMapper.getByBannerId(bannerId);
}
--
Gitblit v1.8.0