From f66e9ca44cca5d91fea3f3a54d9c31880c2c4a48 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期一, 24 二月 2020 11:00:06 +0800
Subject: [PATCH] 素材
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 69 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 7 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 150b73c..516ae77 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
@@ -812,6 +812,7 @@
// 鍘熷皝瑙嗛闈㈠浘
ImgInfo imgVideo = null;
+ ImgInfo imgActivity = null;
List<String> listDel = new ArrayList<String>();
List<String> listOld = new ArrayList<String>();
@@ -829,10 +830,13 @@
if (!StringUtil.isNullOrEmpty(url)) {
listOld.add(url);
}
+ } else if (type == ImgEnum.activity) {
+ imgActivity = info;
}
}
}
+ MultipartFile activityFile = null;
// 瑙嗛閮ㄥ垎
if (fileRequest != null) {
MultipartFile filevideo = fileRequest.getFile("filevideo");
@@ -866,6 +870,9 @@
imgVideo.setW(width);
imgVideo.setH(height);
}
+
+
+ activityFile = fileRequest.getFile("activityFile");
}
List<ImgInfo> listImg = new ArrayList<ImgInfo>();
@@ -884,6 +891,31 @@
}
}
}
+
+ if (activityFile != null) {
+ InputStream inputStream = activityFile.getInputStream();
+ BufferedImage sourceImg = ImageIO.read(inputStream);
+ int width = sourceImg.getWidth();
+ int height = sourceImg.getHeight();
+
+ String picLink = uploadPicture(activityFile);
+
+ ImgInfo activity = new ImgInfo();
+ activity.setId(UUID.randomUUID().toString().replace("-", ""));
+ activity.setLarge(true);
+ activity.setPid(pid);
+ activity.setUrl(picLink);
+ activity.setUrlHD(picLink);
+ activity.setActivityPic(picLink);
+ activity.setW(width);
+ activity.setH(height);
+ activity.setType(ImgEnum.activity);
+ listImg.add(activity);
+ } else if (imgActivity != null) {
+ listImg.add(imgActivity);
+ }
+
+
// 缂栬緫鍥剧墖
if (!StringUtil.isNullOrEmpty(picUrls)) {
@@ -894,10 +926,6 @@
if (fileRequest != null) {
MultipartFile file = fileRequest.getFile("file" + i);
if (file != null) {
- InputStream inputStream = file.getInputStream();
- BufferedImage sourceImg = ImageIO.read(inputStream);
- int width = sourceImg.getWidth();
- int height = sourceImg.getHeight();
picLink = uploadPicture(file);
ImgInfo imgInfo0 = new ImgInfo();
@@ -907,8 +935,8 @@
imgInfo0.setUrl(picLink);
imgInfo0.setUrlHD(picLink);
imgInfo0.setType(ImgEnum.img);
- imgVideo.setW(width);
- imgVideo.setH(height);
+ imgVideo.setW(1);
+ imgVideo.setH(1);
listImg.add(imgInfo0);
continue;
}
@@ -1173,13 +1201,40 @@
GoodsDetailVO goods = goodsEvaluate.getGoods();
if (goods != null) {
GoodsDetailVO goodsNew = getGoodsNewInfo(goods.getGoodsId(), goods.getGoodsType(), paramsDTO);
+ if (goodsNew != null)
+ goodsEvaluate.setGoods(goodsNew);
}
// 鏇存柊鍟嗗搧淇℃伅
List<ImgInfo> imgList = goodsEvaluate.getImgList();
if (imgList == null || imgList.size() == 0) {
continue;
}
-
+
+ for (ImgInfo imgInfo: imgList) {
+ SimpleGoods simpleGoods = imgInfo.getGoods();
+ if (simpleGoods == null) {
+ continue;
+ }
+
+ GoodsDetailVO goodsDetailVO = getGoodsNewInfo(simpleGoods.getGoodsId(), simpleGoods.getGoodsType(), paramsDTO);
+ if (goodsDetailVO != null) {
+ simpleGoods.setPrice(goodsDetailVO.getCouponPrice());
+ CouponInfoVO couponInfo = goodsDetailVO.getCouponInfo();
+ if (couponInfo == null) {
+ simpleGoods.setPrice(goodsDetailVO.getZkPrice());
+ simpleGoods.setState(1);
+ } else {
+ simpleGoods.setPrice(goodsDetailVO.getCouponPrice());
+ simpleGoods.setAmount(couponInfo.getAmount());
+ simpleGoods.setState(0);
+ }
+ imgInfo.setGoods(simpleGoods);
+ imgInfo.setGoodsVO(goodsDetailVO);
+ }
+ }
+
+ goodsEvaluate.setUpdateTime(new Date());
+ goodsEvaluateDao.save(goodsEvaluate);
}
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
--
Gitblit v1.8.0