From e53d3f8be4c6d26b66105f02a69d3ad4097c1a7e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期一, 24 二月 2020 10:01:52 +0800
Subject: [PATCH] 素材大图
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 62 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
index 18ed939..150b73c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
@@ -284,6 +284,7 @@
throw new GoodsEvaluateException(1, "璇ュ晢鍝佷俊鎭笉瀛樺湪");
}
+ int totalImg = 0;
if (listpic != null && listpic.size() > 0) {
for (int i = 0; i < listpic.size(); i++) {
ImgInfo imgInfo0 = new ImgInfo();
@@ -311,10 +312,12 @@
simpleGoods.setState(0);
}
imgInfo0.setGoods(simpleGoods);
+ imgInfo0.setGoodsVO(goodsDetailVO);
} else {
imgInfo0.setType(ImgEnum.img);
}
listImg.add(imgInfo0);
+ totalImg ++;
}
}
@@ -333,7 +336,18 @@
}
}
- // 淇濆瓨鍥剧墖淇℃伅
+ int lineNum = 0;
+ if (totalImg > 0) {
+ if (totalImg == 1) {
+ lineNum = 1;
+ } else if (totalImg <= 4) {
+ lineNum = 2;
+ } else {
+ lineNum = 3;
+ }
+ }
+
+ resultObj.setLineNum(lineNum);
resultObj.setGoods(goodsDetailVO);
resultObj.setMainPicNum(picNum);
resultObj.setImgList(listImg);
@@ -453,10 +467,11 @@
}
}
+ int totalImg = 0;
if (!StringUtil.isNullOrEmpty(goodsList)) {
String[] goodsArray = goodsList.split(",");
if (goodsArray != null && goodsArray.length > 0) {
- for (int i = 0; i < goodsArray.length || i < 9; i++) {
+ for (int i = 0; i < goodsArray.length && i < 9; i++) {
String goodsids = goodsArray[i];
String[] g = goodsids.split("-");
GoodsDetailVO goodsDetailVO = getGoodsDetailVO(Long.parseLong(g[0]), Integer.parseInt(g[1]));
@@ -494,6 +509,9 @@
simpleGoods.setState(0);
}
imgInfo0.setGoods(simpleGoods);
+ imgInfo0.setGoodsVO(goodsDetailVO);
+ listImg.add(imgInfo0);
+ totalImg ++;
}
}
}
@@ -536,6 +554,19 @@
}
}
+ int lineNum = 0;
+ if (totalImg > 0) {
+ if (totalImg == 1) {
+ lineNum = 1;
+ } else if (totalImg <= 4) {
+ lineNum = 2;
+ } else {
+ lineNum = 3;
+ }
+ }
+
+ resultObj.setLineNum(lineNum);
+
// 淇濆瓨鍥剧墖淇℃伅
resultObj.setImgList(listImg);
goodsEvaluateDao.save(resultObj);
@@ -686,6 +717,8 @@
int width = 0;
int height = 0;
+ int width2 = 0;
+ int height2 = 0;
List<ImgInfo> listImg = new ArrayList<ImgInfo>();
if (fileRequest != null) {
MultipartFile filevideo = fileRequest.getFile("filevideo");
@@ -703,6 +736,10 @@
MultipartFile activityfile = fileRequest.getFile("activityfile");
if (activityfile != null) {
removePicture(activityPic);
+ InputStream inputStream = activityfile.getInputStream();
+ BufferedImage sourceImg = ImageIO.read(inputStream);
+ width2 = sourceImg.getWidth();
+ height2 = sourceImg.getHeight();
String picLink = uploadPicture(activityfile);
activityPic = picLink;
}
@@ -741,8 +778,6 @@
} else {
imgactivity = new ImgInfo();
imgactivity.setId(UUID.randomUUID().toString().replace("-", ""));
- imgactivity.setW(1);
- imgactivity.setH(1);
imgactivity.setLarge(true);
imgactivity.setPid(pid);
imgactivity.setUrl(activityPic);
@@ -750,8 +785,16 @@
imgactivity.setActivityUrl(imgInfo.getActivityUrl());
imgactivity.setType(ImgEnum.activity);
}
+ if (width2 > 0) {
+ imgactivity.setW(width2);
+ imgactivity.setH(height2);
+ } else {
+ imgactivity.setW(imgactivity.getW());
+ imgactivity.setH(imgactivity.getH());
+ }
listImg.add(imgactivity);
}
+ resultObj.setLineNum(1);
resultObj.setImgList(listImg);
goodsEvaluateDao.save(resultObj);
}
@@ -831,6 +874,7 @@
if (imgVideo != null && StringUtil.isNullOrEmpty(imgVideo.getUrl())) {
throw new GoodsEvaluateException(1, "瑙嗛灏侀潰鍥句笉鑳戒负绌�");
}
+
imgVideo.setVideoUrl(videoUrl);
listImg.add(imgVideo);
} else {
@@ -842,11 +886,9 @@
}
// 缂栬緫鍥剧墖
- List<String> listpic = null;
if (!StringUtil.isNullOrEmpty(picUrls)) {
String[] pics = picUrls.split(",");
if (pics != null) {
- listpic = new ArrayList<>();
for (int i = 0; i < pics.length; i++) {
String picLink = pics[i];
if (fileRequest != null) {
@@ -860,10 +902,10 @@
ImgInfo imgInfo0 = new ImgInfo();
imgInfo0.setId(UUID.randomUUID().toString().replace("-", ""));
- imgInfo0.setLarge(false);
+ imgInfo0.setLarge(true);
imgInfo0.setPid(pid);
- imgInfo0.setUrl(listpic.get(i));
- imgInfo0.setUrlHD(listpic.get(i));
+ imgInfo0.setUrl(picLink);
+ imgInfo0.setUrlHD(picLink);
imgInfo0.setType(ImgEnum.img);
imgVideo.setW(width);
imgVideo.setH(height);
@@ -901,7 +943,7 @@
listDel.add(listOld.get(j));
}
}
-
+ resultObj.setLineNum(1);
resultObj.setImgList(listImg);
goodsEvaluateDao.save(resultObj);
--
Gitblit v1.8.0