From 1d841af6d10c30b5eba4089a983c64fee662bbc9 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 11:56:24 +0800
Subject: [PATCH] 发圈bug + 刷单预警改为100单

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java |   65 ++++++++++++++++----------------
 1 files changed, 32 insertions(+), 33 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 8b4e77d..c2ec6b4 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
@@ -70,10 +70,8 @@
 import com.yeshi.fanli.util.jd.JDApiUtil;
 import com.yeshi.fanli.util.jd.JDUtil;
 import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
-import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
 import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 import com.yeshi.fanli.vo.goods.CouponInfoVO;
 import com.yeshi.fanli.vo.goods.GoodsDetailVO;
 import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
@@ -1258,48 +1256,49 @@
 			listImg.add(imgActivity);
 		}
 
-		int totalImg = 0;
 		// 缂栬緫鍥剧墖
+		List<String> listpic = new ArrayList<>();
 		if (!StringUtil.isNullOrEmpty(picUrls)) {
 			String[] pics = picUrls.split(",");
 			if (pics != null) {
 				for (int i = 0; i < pics.length; i++) {
 					String picLink = pics[i];
-					if (fileRequest != null) {
-						MultipartFile file = fileRequest.getFile("file" + i);
-						if (file != null) {
-							picLink = uploadPicture(file);
-
-							ImgInfo imgInfo0 = new ImgInfo();
-							imgInfo0.setId(UUID.randomUUID().toString().replace("-", ""));
-							imgInfo0.setLarge(false);
-							imgInfo0.setPid(pid);
-							imgInfo0.setUrl(picLink);
-							imgInfo0.setUrlHD(picLink);
-							imgInfo0.setType(ImgEnum.img);
-							imgInfo0.setW(1);
-							imgInfo0.setH(1);
-							listImg.add(imgInfo0);
-							totalImg++;
-							continue;
-						}
-					}
-
 					if (picLink.startsWith("http")) {
-						if (listOldImgInfo != null) {
-							for (ImgInfo imgInfo : listOldImgInfo) {
-								String url = imgInfo.getUrl();
-								if (picLink.equals(url)) {
-									listImg.add(imgInfo);
-									totalImg++;
-									break;
-								}
-							}
-						}
+						listpic.add(picLink);
 					}
 				}
 			}
 		}
+				
+		// 涓婁紶鏂囦欢鏇挎崲
+		if (fileRequest != null) {
+			for (int i = 0; i < 9; i++) {
+				MultipartFile file = fileRequest.getFile("file" + i);
+				if (file != null) {
+					String picLink = uploadPicture(file);
+					if (i < listpic.size()) {
+						listpic.set(i, picLink);
+					} else {
+						listpic.add(picLink);
+					}
+				}
+			}
+		}
+		
+		int totalImg = 0;
+		for (String pic : listpic) {
+			ImgInfo imgInfo0 = new ImgInfo();
+			imgInfo0.setId(UUID.randomUUID().toString().replace("-", ""));
+			imgInfo0.setLarge(false);
+			imgInfo0.setPid(pid);
+			imgInfo0.setUrl(pic);
+			imgInfo0.setUrlHD(pic);
+			imgInfo0.setType(ImgEnum.img);
+			imgInfo0.setW(1);
+			imgInfo0.setH(1);
+			listImg.add(imgInfo0);
+			totalImg++;
+		}
 
 		if (listOld != null && listOld.size() > 0) {
 			for (int j = 0; j < listOld.size(); j++) {

--
Gitblit v1.8.0