From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图,添加口碑

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java |  411 +++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 276 insertions(+), 135 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 c78bd7d..911bbd4 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
@@ -54,6 +54,7 @@
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
 import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
 import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
 import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
@@ -89,6 +90,9 @@
 
 	@Resource
 	private HongBaoManageService hongBaoManageService;
+	
+	@Resource
+	private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
 
 	@Resource(name = "taskExecutor")
 	private TaskExecutor executor;
@@ -111,6 +115,28 @@
 	@Resource
 	private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
 
+	
+	@Override
+	public void switchState(String id) throws GoodsEvaluateException {
+		if (id == null) {
+			throw new GoodsEvaluateException(1, "璇蜂紶閫掓纭弬鏁�");
+		}
+		
+		GoodsEvaluate resultObj = goodsEvaluateDao.getById(id);
+		if (resultObj == null) {
+			throw new GoodsEvaluateException(1, "姝ゅ唴瀹瑰凡涓嶅瓨鍦�");
+		}
+		
+		Integer state = resultObj.getState();
+		if (state == null || state == 0) {
+			state = 1;
+		} else {
+			state = 0;
+		}
+		goodsEvaluateDao.updateSatate(id, state);
+	}
+	
+	
 	@Override
 	public String saveHead(MultipartFile file, GoodsEvaluate record) throws GoodsEvaluateException {
 		Integer state = record.getState();
@@ -137,7 +163,11 @@
 			if (record.getStartTime() != null && record.getEndTime().getTime() <= record.getStartTime().getTime())
 				throw new GoodsEvaluateException(1, "鎴鏃堕棿蹇呴』澶т簬寮�濮嬫椂闂�");
 		} else {
-			record.setEndTime(DateUtil.plusDayDate(3, new Date()));
+			if (record.getStartTime() == null) {
+				record.setEndTime(DateUtil.plusDayDate(3, new Date()));
+			} else {
+				record.setEndTime(DateUtil.plusDayDate(3, record.getStartTime()));
+			}
 		}
 
 		Integer dynamicType = record.getDynamicType();
@@ -223,6 +253,31 @@
 		}
 		return null;
 	}
+	
+	private ImgInfo uploadOriginalPicture(MultipartFile file) {
+		try {
+			InputStream inputStream = file.getInputStream();
+			String contentType = file.getContentType();
+			String type = contentType.substring(contentType.indexOf("/") + 1);
+			String filePath = FilePathEnum.goodsEvaluate.getPath() + UUID.randomUUID().toString().replace("-", "") + "."+ type;
+			
+			BufferedImage sourceImg = ImageIO.read(inputStream);
+			ImgInfo info = new ImgInfo();
+			int width = sourceImg.getWidth();
+			int height = sourceImg.getHeight();
+			
+			String picLink = COSManager.getInstance().uploadFile(file.getInputStream(), filePath).getUrl();
+			
+			info.setH(height);
+			info.setW(width);
+			info.setUrl(picLink);
+			return info;
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
 
 	private String uploadPicture(File file, String contentType) throws Exception {
 		InputStream inputStream = new FileInputStream(file);
@@ -362,7 +417,7 @@
 		GoodsDetailVO goodsDetailVO = null;
 		JDGoods jdGoods = null;
 		PDDGoodsDetail pddGoods = null;
-		ConfigParamsDTO params = hongBaoManageService.getShowComputeRate("android", "55");
+		ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
 		params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
 		if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
 			try {
@@ -445,7 +500,7 @@
 				lineNum = 1;
 			} else if (totalImg == 3) {
 				lineNum = 3;
-			} else if (totalImg <= 4) {
+			} else if (totalImg == 2 || totalImg == 4) {
 				lineNum = 2;
 			} else {
 				lineNum = 3;
@@ -584,7 +639,7 @@
 
 	public GoodsDetailVO getGoodsDetailVO(Long goodsId, Integer goodsType) throws GoodsEvaluateException {
 		GoodsDetailVO goodsDetail = null;
-		ConfigParamsDTO params = hongBaoManageService.getShowComputeRate("android", "55");
+		ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
 		params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
 		if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
 			try {
@@ -780,7 +835,7 @@
 				lineNum = 1;
 			} else if (totalImg == 3) {
 				lineNum = 3;
-			} else if (totalImg <= 4) {
+			} else if (totalImg == 2 || totalImg == 4) {
 				lineNum = 2;
 			} else {
 				lineNum = 3;
@@ -875,36 +930,43 @@
 			throw new GoodsEvaluateException(1, "璇蜂繚瀛樼涓�閮ㄥ垎淇℃伅");
 		}
 
-		if (StringUtil.isNullOrEmpty(commentInfo.getCoupon())) {
-			throw new GoodsEvaluateException(1, "鍒搁潰棰濅笉鑳戒负绌�");
-		}
-
-		if (StringUtil.isNullOrEmpty(commentInfo.getTagDesc())) {
-			throw new GoodsEvaluateException(1, "鎻忚堪璇笉鑳戒负绌�");
-		}
-
-		String tagUrl = commentInfo.getTagUrl();
-		String content = commentInfo.getContent();
-		if (StringUtil.isNullOrEmpty(tagUrl) && StringUtil.isNullOrEmpty(content)) {
-			throw new GoodsEvaluateException(1, "璇勮璇拰閾炬帴涓嶈兘鍚屾椂涓虹┖");
-		}
-
-		String endTime = commentInfo.getEndTime();
-		if (!StringUtil.isNullOrEmpty(endTime)) {
-			try {
-				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-				sdf.parse(endTime);
-			} catch (Exception e) {
-				throw new GoodsEvaluateException(1, "璇峰~鍐欐纭殑鏃堕棿鏍煎紡锛�2020-03-05");
+		GoodsEvaluate resultObj = goodsEvaluateDao.getById(pid);
+		if (resultObj == null)
+			throw new GoodsEvaluateException(1, "绗竴閮ㄥ垎淇℃伅缂哄け");
+		
+		if (EvaluateEnum.activity != resultObj.getType()) {
+			if (StringUtil.isNullOrEmpty(commentInfo.getCoupon())) {
+				throw new GoodsEvaluateException(1, "鍒搁潰棰濅笉鑳戒负绌�");
 			}
-		} else {
-			throw new GoodsEvaluateException(1, "璇峰~鍐欏埜鎴鏃堕棿");
+
+			if (StringUtil.isNullOrEmpty(commentInfo.getTagDesc())) {
+				throw new GoodsEvaluateException(1, "鎻忚堪璇笉鑳戒负绌�");
+			}
+
+			String tagUrl = commentInfo.getTagUrl();
+			String content = commentInfo.getContent();
+			if (StringUtil.isNullOrEmpty(tagUrl) && StringUtil.isNullOrEmpty(content)) {
+				throw new GoodsEvaluateException(1, "璇勮璇拰閾炬帴涓嶈兘鍚屾椂涓虹┖");
+			}
+
+			String endTime = commentInfo.getEndTime();
+			if (!StringUtil.isNullOrEmpty(endTime)) {
+				try {
+					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+					sdf.parse(endTime);
+				} catch (Exception e) {
+					throw new GoodsEvaluateException(1, "璇峰~鍐欐纭殑鏃堕棿鏍煎紡锛�2020-03-05");
+				}
+			} else {
+				throw new GoodsEvaluateException(1, "璇峰~鍐欏埜鎴鏃堕棿");
+			}
 		}
 
 		if (commentInfo.getNeedSpin() == null) {
 			commentInfo.setNeedSpin(false);
 		}
 		
+		String content = commentInfo.getContent();
 		if (!StringUtil.isNullOrEmpty(content) && commentInfo.getNeedSpin()) {
 			try {
 				convertLinkManager.convertLinkFromText(content, Constant.LINK_TOKEN_VERIFY_UID, true);
@@ -917,9 +979,6 @@
 			}
 		}
 
-		GoodsEvaluate resultObj = goodsEvaluateDao.getById(pid);
-		if (resultObj == null)
-			throw new GoodsEvaluateException(1, "绗竴閮ㄥ垎淇℃伅缂哄け");
 
 		List<CommentInfo> comments = new ArrayList<>();
 		CommentInfo currencyCoupon = null;
@@ -971,7 +1030,7 @@
 	}
 
 	@Override
-	public void saveActivityPic(String pid, ImgInfo imgInfo, MultipartHttpServletRequest fileRequest)
+	public void saveActivityPic(String pid, ImgInfo imgInfo, String picUrls, MultipartHttpServletRequest fileRequest)
 			throws GoodsEvaluateException, Exception {
 		if (StringUtil.isNullOrEmpty(pid)) {
 			throw new GoodsEvaluateException(1, "璇蜂繚瀛樼涓�閮ㄥ垎淇℃伅");
@@ -980,122 +1039,175 @@
 		GoodsEvaluate resultObj = goodsEvaluateDao.getById(pid);
 		if (resultObj == null)
 			throw new GoodsEvaluateException(1, "绗竴閮ㄥ垎淇℃伅缂哄け");
+		
+		if (imgInfo == null || StringUtil.isNullOrEmpty(imgInfo.getActivityUrl())) {
+			throw new GoodsEvaluateException(1, "娲诲姩閾炬帴涓嶈兘涓虹┖");
+		}
 
-		String videoPic = null;
-		String activityPic = null;
 		ImgInfo imgVideo = null;
-		ImgInfo imgactivity = null;
+		List<String> listDel = new ArrayList<String>();
+		List<ImgInfo> listOld = new ArrayList<ImgInfo>();
 		List<ImgInfo> resultList = resultObj.getImgList();
 		if (resultList != null && resultList.size() > 0) {
 			for (ImgInfo info : resultList) {
-				if (info.getType() == ImgEnum.activity) {
-					activityPic = info.getActivityPic();
-					imgactivity = info;
-				} else {
+				if (info.getType() == ImgEnum.video) {
 					imgVideo = info;
-					videoPic = info.getUrl();
+				} else {
+					listOld.add(info);
+				}
+			}
+		}
+		
+		// 瑙嗛閮ㄥ垎
+		if (fileRequest != null) {
+			MultipartFile filevideo = fileRequest.getFile("filevideo");
+			if (filevideo != null) {
+				if (StringUtil.isNullOrEmpty(imgInfo.getVideoUrl())) {
+					throw new GoodsEvaluateException(1, "瑙嗛閾炬帴涓嶈兘涓虹┖");
+				}
+				ImgInfo info = uploadVideoPicture(filevideo);
+				if (info == null)
+					throw new GoodsEvaluateException(2, "瑙嗛鍥剧墖涓婁紶澶辫触");
+				if (imgVideo != null) {
+					String url = imgVideo.getUrl();
+					if (!StringUtil.isNullOrEmpty(url)) {
+						listDel.add(url);
+					}
+					imgVideo.setUrl(info.getUrl());
+					imgVideo.setUrlHD(info.getUrl());
+				} else {
+					imgVideo = new ImgInfo();
+					imgVideo.setId(UUID.randomUUID().toString().replace("-", ""));
+					imgVideo.setLarge(true);
+					imgVideo.setPid(pid);
+					imgVideo.setUrl(info.getUrl());
+					imgVideo.setUrlHD(info.getUrl());
+					imgVideo.setVideoUrl(imgInfo.getVideoUrl());
+					imgVideo.setType(ImgEnum.video);
+				}
+				imgVideo.setW(info.getW());
+				imgVideo.setH(info.getH());
+			}
+		}
+
+		
+		List<ImgInfo> listImg = new ArrayList<ImgInfo>();
+		if (imgVideo != null) {
+			if (!StringUtil.isNullOrEmpty(imgInfo.getVideoUrl())) {
+				if (imgVideo != null && StringUtil.isNullOrEmpty(imgVideo.getUrl())) {
+					throw new GoodsEvaluateException(1, "瑙嗛灏侀潰鍥句笉鑳戒负绌�");
+				}
+				imgVideo.setVideoUrl(imgInfo.getVideoUrl());
+				listImg.add(imgVideo);
+			} else {
+				String url = imgVideo.getUrl();
+				if (!StringUtil.isNullOrEmpty(url)) {
+					listDel.add(url);
+				}
+			}
+		}
+ 
+		String activityUrl = imgInfo.getActivityUrl();
+		// 缂栬緫鍥剧墖
+		List<ImgInfo> tempList = new ArrayList<ImgInfo>();
+		if (!StringUtil.isNullOrEmpty(picUrls)) {
+			String[] pics = picUrls.split(",");
+			if (pics != null) {
+				for (int i = 0; i < pics.length; i++) {
+					String picLink = pics[i];
+					if (picLink.startsWith("http")) {
+						if (listOld != null) {
+							for (ImgInfo info: listOld) {
+								if (info.getUrl().equals(picLink)) {
+									info.setActivityUrl(activityUrl);
+									tempList.add(info);
+									break;
+								}
+							}
+						}
+					}
 				}
 			}
 		}
 
-		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");
-			if (filevideo != null) {
-				removePicture(videoPic);
-
-				ImgInfo info = uploadVideoPicture(filevideo);
-				if (info == null)
-					throw new GoodsEvaluateException(2, "瑙嗛鍥剧墖涓婁紶澶辫触");
-				videoPic = info.getUrl();
-				width = info.getW();
-				height = info.getH();
-			}
-
-			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;
+			for (int i = 0; i < 9; i++) {
+				MultipartFile file = fileRequest.getFile("file" + i);
+				if (file != null) {
+					ImgInfo info = uploadOriginalPicture(file);
+					ImgInfo imgInfo0 = new ImgInfo();
+					imgInfo0.setId(UUID.randomUUID().toString().replace("-", ""));
+					imgInfo0.setLarge(false);
+					imgInfo0.setPid(pid);
+					imgInfo0.setUrl(info.getUrl());
+					imgInfo0.setUrlHD(info.getUrl());
+					imgInfo0.setType(ImgEnum.activity);
+					imgInfo0.setW(info.getW());
+					imgInfo0.setH(info.getH());
+					imgInfo0.setActivityUrl(activityUrl);
+					if (i < tempList.size()) {
+						tempList.set(i, imgInfo0);
+					} else {
+						tempList.add(imgInfo0);
+					}
+				} 
 			}
 		}
-
-		if (!StringUtil.isNullOrEmpty(videoPic) || !StringUtil.isNullOrEmpty(imgInfo.getVideoUrl())) {
-			if (imgVideo != null) {
-				imgVideo.setUrl(videoPic);
-				imgVideo.setUrlHD(videoPic);
-				imgVideo.setVideoUrl(imgInfo.getVideoUrl());
-			} else {
-				imgVideo = new ImgInfo();
-				imgVideo.setId(UUID.randomUUID().toString().replace("-", ""));
-				imgVideo.setLarge(true);
-				imgVideo.setPid(pid);
-				imgVideo.setUrl(videoPic);
-				imgVideo.setUrlHD(videoPic);
-				imgVideo.setVideoUrl(imgInfo.getVideoUrl());
-				imgVideo.setType(ImgEnum.video);
-			}
-			if (width > 0) {
-				imgVideo.setW(width);
-				imgVideo.setH(height);
-			} else {
-				imgVideo.setW(imgVideo.getW());
-				imgVideo.setH(imgVideo.getH());
-			}
-			listImg.add(imgVideo);
-		}
-
-		int totalImg = 0;
-		if (!StringUtil.isNullOrEmpty(activityPic) || !StringUtil.isNullOrEmpty(imgInfo.getActivityUrl())) {
-			if (imgactivity != null) {
-				imgactivity.setUrl(activityPic);
-				imgactivity.setUrlHD(activityPic);
-				imgactivity.setActivityUrl(imgInfo.getActivityUrl());
-			} else {
-				imgactivity = new ImgInfo();
-				imgactivity.setId(UUID.randomUUID().toString().replace("-", ""));
-				imgactivity.setLarge(true);
-				imgactivity.setPid(pid);
-				imgactivity.setUrl(activityPic);
-				imgactivity.setUrlHD(activityPic);
-				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);
-			totalImg++;
-		}
-
+		
+		
 		int lineNum = 0;
+		int totalImg = tempList.size();
 		if (totalImg > 0) {
 			if (totalImg == 1) {
 				lineNum = 1;
 			} else if (totalImg == 3) {
 				lineNum = 3;
-			} else if (totalImg <= 4) {
+			} else if (totalImg == 2 || totalImg == 4) {
 				lineNum = 2;
 			} else {
 				lineNum = 3;
 			}
 		}
-
+		
+		// 涓�寮犲浘鏄剧ず涓哄ぇ鍥�
+		if (tempList.size() == 1) {
+			tempList.get(0).setLarge(true);
+		}
+		
+		if (tempList.size() > 0) {
+			listImg.addAll(tempList);
+		}
+		
+		// 娓呯悊鑰佸浘鐗�
+		if (listOld != null && listOld.size() > 0) {
+			for (ImgInfo infoOld: listOld) {
+				boolean del = true;
+				String oldPic = infoOld.getUrl();
+				for (ImgInfo info : listImg) {
+					if (info.getUrl().equals(oldPic)) {
+						del = false;
+					}
+				}
+				if (del)
+					listDel.add(infoOld.getUrl());
+			}
+		}
+		
+		resultObj.setJumpLink(activityUrl);
 		resultObj.setLineNum(lineNum);
 		resultObj.setImgList(listImg);
 		goodsEvaluateDao.save(resultObj);
+		
+		// 鍒犻櫎鍥剧墖
+		if (listDel.size() > 0) {
+			for (String url : listDel) {
+				if (url.contains(FilePathEnum.goodsEvaluate.getPath())) {
+					removePicture(url);
+				}
+			}
+		}
 	}
 
 	@Override
@@ -1276,7 +1388,7 @@
 				lineNum = 1;
 			} else if (totalImg == 3) {
 				lineNum = 3;
-			} else if (totalImg <= 4) {
+			} else if (totalImg == 2 || totalImg == 4) {
 				lineNum = 2;
 			} else {
 				lineNum = 3;
@@ -1428,13 +1540,13 @@
 	}
 
 	@Override
-	public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType) {
-		return goodsEvaluateDao.query(start, count, key, state, dynamicType);
+	public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType, String typeEnum) {
+		return goodsEvaluateDao.query(start, count, key, state, dynamicType, typeEnum);
 	}
 
 	@Override
-	public long count(String key, Integer state, int dynamicType) {
-		return goodsEvaluateDao.count(key, state, dynamicType);
+	public long count(String key, Integer state, int dynamicType, String typeEnum) {
+		return goodsEvaluateDao.count(key, state, dynamicType, typeEnum);
 	}
 
 	@Override
@@ -1488,6 +1600,8 @@
 
 				// 鍒犻櫎宸茶繃鏈�
 				removeOverdue();
+				
+				removeDownGoods();
 			}
 		});
 
@@ -1520,7 +1634,7 @@
 			}
 
 			// 鎸夌収鍙戝竷鏄剧ず鏃堕棿娈佃捣濮嬫椂闂翠负鍑嗐��
-			goodsEvaluate.setPublishTime(goodsEvaluate.getStartTime());
+			evaluateNew.setPublishTime(evaluateNew.getStartTime());
 
 			List<CommentInfo> comments = evaluateNew.getComments();
 			if (comments != null && comments.size() > 0) {
@@ -1655,6 +1769,8 @@
 
 				// 鍒犻櫎宸茶繃鏈�
 				removeOverdue();
+				
+				removeDownGoods();
 			}
 		});
 
@@ -1681,7 +1797,7 @@
 		try {
 			Date now = new Date();
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			ConfigParamsDTO params = hongBaoManageService.getShowComputeRate("android", "55");
+			ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
 			params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
 			for (GoodsEvaluate goodsEvaluate : list) {
 				// 鏄惁2涓皬鏃朵箣鍐呭凡鏇存柊
@@ -1836,7 +1952,7 @@
 		imgs.addAll(goodsBrief.getImgList());
 
 		// 鍟嗗搧VO
-		ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
+		ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
 		paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
 		GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
 
@@ -1903,7 +2019,7 @@
 				lineNum = 1;
 			} else if (imgList.size() == 3) {
 				lineNum = 3;
-			} else if (imgList.size() <= 4) {
+			} else if (imgList.size() == 2 || imgList.size() == 4) {
 				lineNum = 2;
 			} else {
 				lineNum = 3;
@@ -1977,7 +2093,7 @@
 				return false;
 			}
 
-			ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
+			ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
 			paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
 			GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
 			// 鍙戝竷鐢ㄦ埛
@@ -2131,7 +2247,7 @@
 					lineNum = 1;
 				} else if (imgList.size() == 3) {
 					lineNum = 3;
-				} else if (imgList.size() <= 4) {
+				} else if (imgList.size() == 2 || imgList.size() == 4) {
 					lineNum = 2;
 				} else {
 					lineNum = 3;
@@ -2202,7 +2318,7 @@
 				return;
 			}
 
-			ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
+			ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
 			paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
 			GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
 			updateGoods(queryExist, goodsNew);
@@ -2222,7 +2338,7 @@
 			return;
 		}
 
-		ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
+		ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
 		paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
 		GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);
 
@@ -2239,7 +2355,7 @@
 			return;
 		}
 
-		ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
+		ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
 		paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
 		GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);
 		updateGoods(queryExist, goodsNew);
@@ -2343,7 +2459,13 @@
 	}
 	
 
+	/**
+	 * 鍒犻櫎宸茶繃鏈熸椂闂�
+	 */
 	private void removeOverdue() {
+		if(1>0)
+			return;
+		
 		List<GoodsEvaluate> list = goodsEvaluateDao.queryOverdue();
 		if (list == null || list.size() == 0) {
 			return;
@@ -2364,4 +2486,23 @@
 		}
 	}
 
+	/**
+	 * 鍒犻櫎鍟嗗搧宸蹭笅鏋�-鍗曞搧
+	 */
+	private void removeDownGoods() {
+		if(1>0)
+			return;
+		try {
+			List<GoodsEvaluate> list = goodsEvaluateDao.removeDownGoods();
+			if (list == null || list.size() == 0) {
+				return;
+			}
+
+			for (GoodsEvaluate goodsEvaluate : list) {
+				goodsEvaluateDao.remove(goodsEvaluate);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 }

--
Gitblit v1.8.0