From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java |  295 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 176 insertions(+), 119 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 a063e7f..adb054c 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
@@ -17,6 +17,7 @@
 import javax.imageio.ImageIO;
 
 import org.apache.commons.beanutils.PropertyUtils;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Service;
@@ -34,10 +35,8 @@
 import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
 import com.yeshi.fanli.entity.dynamic.CommentInfo;
 import com.yeshi.fanli.entity.dynamic.CommentInfo.CommentInfoEnum;
-import com.yeshi.fanli.entity.dynamic.DynamicInfo;
 import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
 import com.yeshi.fanli.entity.dynamic.GoodsEvaluate.EvaluateEnum;
-import com.yeshi.fanli.entity.dynamic.GoodsPicture;
 import com.yeshi.fanli.entity.dynamic.ImgInfo;
 import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;
 import com.yeshi.fanli.entity.dynamic.SimpleGoods;
@@ -55,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;
@@ -90,6 +90,9 @@
 
 	@Resource
 	private HongBaoManageService hongBaoManageService;
+	
+	@Resource
+	private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
 
 	@Resource(name = "taskExecutor")
 	private TaskExecutor executor;
@@ -112,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();
@@ -138,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();
@@ -363,7 +392,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 {
@@ -446,7 +475,7 @@
 				lineNum = 1;
 			} else if (totalImg == 3) {
 				lineNum = 3;
-			} else if (totalImg <= 4) {
+			} else if (totalImg == 2 || totalImg == 4) {
 				lineNum = 2;
 			} else {
 				lineNum = 3;
@@ -527,6 +556,7 @@
 			commentInfo.setId(UUID.randomUUID().toString().replace("-", ""));
 			commentInfo.setContent(commentText);
 			commentInfo.setTypeEnum(CommentInfoEnum.goodsCoupon);
+			commentInfo.setNeedSpin(true);
 			commentsNew.add(commentInfo);
 			resultObj.setComments(commentsNew);
 		}
@@ -584,7 +614,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 +810,7 @@
 				lineNum = 1;
 			} else if (totalImg == 3) {
 				lineNum = 3;
-			} else if (totalImg <= 4) {
+			} else if (totalImg == 2 || totalImg == 4) {
 				lineNum = 2;
 			} else {
 				lineNum = 3;
@@ -852,7 +882,8 @@
 			if (StringUtil.isNullOrEmpty(commentInfo.getId())) {
 				commentInfo.setId(UUID.randomUUID().toString().replace("-", ""));
 			}
-
+			
+			commentInfo.setNeedSpin(true);
 			commentInfo.setType(commentInfo.getTags());
 			commentInfo.setTypeEnum(CommentInfoEnum.goodsCoupon);
 			newList.add(commentInfo);
@@ -866,60 +897,7 @@
 		goodsEvaluateDao.save(resultObj);
 	}
 
-	@Override
-	public void saveGoodsCoupon(String pid, String content) throws GoodsEvaluateException, Exception {
-		if (StringUtil.isNullOrEmpty(pid)) {
-			throw new GoodsEvaluateException(1, "璇蜂繚瀛樼涓�閮ㄥ垎淇℃伅");
-		}
-
-		GoodsEvaluate resultObj = goodsEvaluateDao.getById(pid);
-		if (resultObj == null)
-			throw new GoodsEvaluateException(1, "绗竴閮ㄥ垎淇℃伅缂哄け");
-
-		CommentInfo goodsCoupon = null;
-		CommentInfo currencyCoupon = null;
-		List<CommentInfo> oldComments = resultObj.getComments();
-		if (oldComments != null) {
-			for (CommentInfo info : oldComments) {
-				if (CommentInfoEnum.goodsCoupon == info.getTypeEnum()) {
-					goodsCoupon = info;
-				} else if (CommentInfoEnum.currencyCoupon == info.getTypeEnum()) {
-					currencyCoupon = info;
-				}
-			}
-		}
-
-		List<CommentInfo> comments = new ArrayList<>();
-		if (!StringUtil.isNullOrEmpty(content)) {
-
-			if (!StringUtil.isNullOrEmpty(content)) {
-				try {
-					convertLinkManager.convertLinkFromText(content, 1L, true);
-				} catch (Exception e) {
-					throw new GoodsEvaluateException(1, "涓嶅寘鍚彲杞摼鐨勫彛浠や笌閾炬帴");
-				}
-			}
-
-			CommentInfo commentInfo = new CommentInfo();
-			if (goodsCoupon != null) {
-				commentInfo.setId(goodsCoupon.getId());
-			} else {
-				commentInfo.setId(UUID.randomUUID().toString().replace("-", ""));
-			}
-			commentInfo.setContent(content);
-			commentInfo.setType(commentInfo.getTags());
-			commentInfo.setTypeEnum(CommentInfoEnum.goodsCoupon);
-			comments.add(commentInfo);
-		}
-
-		if (currencyCoupon != null) {
-			comments.add(currencyCoupon);
-		}
-
-		resultObj.setComments(comments);
-		goodsEvaluateDao.save(resultObj);
-	}
-
+	 
 	@Override
 	public void saveCurrencyCoupon(String pid, int kind, CommentInfo commentInfo)
 			throws GoodsEvaluateException, Exception {
@@ -953,16 +931,21 @@
 			throw new GoodsEvaluateException(1, "璇峰~鍐欏埜鎴鏃堕棿");
 		}
 
-		// 鍧囦笉楠岃瘉
-		/*
-		 * if (!StringUtil.isNullOrEmpty(content) && kind != 3) { try {
-		 * convertLinkManager.convertLinkFromText(content,
-		 * Constant.LINK_TOKEN_VERIFY_UID, true); } catch
-		 * (ConvertLinkExceptionException e) { if
-		 * (ConvertLinkExceptionException.CODE_NONE != e.getCode()) { throw new
-		 * GoodsEvaluateException(1, "鍖呭惈涓嶅彲杞摼鐨勫彛浠や笌閾炬帴"); } } catch (Exception e) {
-		 * throw new GoodsEvaluateException(1, "鍖呭惈涓嶅彲杞摼鐨勫彛浠や笌閾炬帴"); } }
-		 */
+		if (commentInfo.getNeedSpin() == null) {
+			commentInfo.setNeedSpin(false);
+		}
+		
+		if (!StringUtil.isNullOrEmpty(content) && commentInfo.getNeedSpin()) {
+			try {
+				convertLinkManager.convertLinkFromText(content, Constant.LINK_TOKEN_VERIFY_UID, true);
+			} catch (ConvertLinkExceptionException e) {
+				if (ConvertLinkExceptionException.CODE_NONE != e.getCode()) {
+					throw new GoodsEvaluateException(1, "鍖呭惈涓嶅彲杞摼鐨勫彛浠や笌閾炬帴");
+				}
+			} catch (Exception e) {
+				throw new GoodsEvaluateException(1, "鍖呭惈涓嶅彲杞摼鐨勫彛浠や笌閾炬帴");
+			}
+		}
 
 		GoodsEvaluate resultObj = goodsEvaluateDao.getById(pid);
 		if (resultObj == null)
@@ -1133,7 +1116,7 @@
 				lineNum = 1;
 			} else if (totalImg == 3) {
 				lineNum = 3;
-			} else if (totalImg <= 4) {
+			} else if (totalImg == 2 || totalImg == 4) {
 				lineNum = 2;
 			} else {
 				lineNum = 3;
@@ -1323,7 +1306,7 @@
 				lineNum = 1;
 			} else if (totalImg == 3) {
 				lineNum = 3;
-			} else if (totalImg <= 4) {
+			} else if (totalImg == 2 || totalImg == 4) {
 				lineNum = 2;
 			} else {
 				lineNum = 3;
@@ -1535,6 +1518,8 @@
 
 				// 鍒犻櫎宸茶繃鏈�
 				removeOverdue();
+				
+				removeDownGoods();
 			}
 		});
 
@@ -1565,9 +1550,6 @@
 				e.printStackTrace();
 				continue;
 			}
-
-			// 鎸夌収鍙戝竷鏄剧ず鏃堕棿娈佃捣濮嬫椂闂翠负鍑嗐��
-			goodsEvaluate.setPublishTime(goodsEvaluate.getStartTime());
 
 			// 鎸夌収鍙戝竷鏄剧ず鏃堕棿娈佃捣濮嬫椂闂翠负鍑嗐��
 			goodsEvaluate.setPublishTime(goodsEvaluate.getStartTime());
@@ -1705,6 +1687,8 @@
 
 				// 鍒犻櫎宸茶繃鏈�
 				removeOverdue();
+				
+				removeDownGoods();
 			}
 		});
 
@@ -1731,7 +1715,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涓皬鏃朵箣鍐呭凡鏇存柊
@@ -1852,11 +1836,15 @@
 	}
 
 	@Override
-	public void addGoodsEvaluate(Long goodsId, List<ImgInfo> imgList, ActivityUser user, String title, String comment)
-			throws GoodsEvaluateException {
+	public void addGoodsEvaluate(Long goodsId, List<ImgInfo> imgList, ActivityUser user, String title, String comment,
+			Date startTime) throws GoodsEvaluateException {
 		if (goodsId == null || user == null || StringUtil.isNullOrEmpty(title)) {
 			throw new GoodsEvaluateException(1, "鐩稿叧鍙傛暟涓嶈兘涓虹┖");
 		}
+
+		List<GoodsEvaluate> evaluateList = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO, goodsId);
+		if (evaluateList != null && evaluateList.size() > 0)
+			return;
 
 		TaoBaoGoodsBrief goodsBrief = null;
 		try {
@@ -1882,7 +1870,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);
 
@@ -1920,6 +1908,7 @@
 
 		// 璇勮鍐呭
 		CommentInfo commentInfo = new CommentInfo();
+		commentInfo.setNeedSpin(true);
 		commentInfo.setId(UUID.randomUUID().toString().replace("-", ""));
 		commentInfo.setTypeEnum(CommentInfoEnum.goodsCoupon);
 		if (!StringUtil.isNullOrEmpty(comment)) {
@@ -1929,16 +1918,11 @@
 			String token = shareGoodsService.createTaoBaoToken(Constant.LINK_TOKEN_VERIFY_UID, goodsBrief);
 			String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
 			String commentText = template.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
-			commentText = commentText.replace("[鍘熶环]", MoneyBigDecimalUtil.getWithNoZera(goodsVO.getZkPrice()) + "");
 			if (!goodsVO.isHasCoupon()) {
 				commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
 				commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
-			} else {
-				commentText = commentText.replace("[鍒稿悗浠穄",
-						MoneyBigDecimalUtil.getWithNoZera(goodsVO.getCouponPrice()) + "");
-			}
-			commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n",
-					"\r\n");
+				commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n","\r\n");
+			} 
 			commentInfo.setContent(commentText);
 			commentInfo.setType(CommentInfoEnum.goodsCoupon.getDesc());
 		}
@@ -1948,12 +1932,12 @@
 
 		// 涓�琛屾樉绀哄灏戜釜鍥剧墖
 		int lineNum = 0;
-		if (imgs.size() > 0) {
-			if (imgs.size() == 1) {
+		if (imgList.size() > 0) {
+			if (imgList.size() == 1) {
 				lineNum = 1;
-			} else if (imgs.size() == 3) {
+			} else if (imgList.size() == 3) {
 				lineNum = 3;
-			} else if (imgs.size() <= 4) {
+			} else if (imgList.size() == 2 || imgList.size() == 4) {
 				lineNum = 2;
 			} else {
 				lineNum = 3;
@@ -1970,7 +1954,9 @@
 		goodsEvaluate.setShareNum((int) (Math.random() * 5000) + 1000);
 		goodsEvaluate.setShareNumReal(0);
 		goodsEvaluate.setWeight(0.0);
-		goodsEvaluate.setStartTime(new Date());
+		if (startTime == null)
+			startTime = new Date();
+		goodsEvaluate.setStartTime(startTime);
 		goodsEvaluate.setEndTime(DateUtil.plusDayDate(3, new Date()));
 		goodsEvaluate.setPublishTime(new Date());
 		goodsEvaluate.setCreateTime(new Date());
@@ -2025,7 +2011,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);
 			// 鍙戝竷鐢ㄦ埛
@@ -2089,19 +2075,6 @@
 			}
 			imgs.addAll(goodsimgs);
 
-			int lineNum = 0;
-			if (imgs.size() > 0) {
-				if (imgs.size() == 1) {
-					lineNum = 1;
-				} else if (imgs.size() == 3) {
-					lineNum = 3;
-				} else if (imgs.size() <= 4) {
-					lineNum = 2;
-				} else {
-					lineNum = 3;
-				}
-			}
-			goodsEvaluate.setLineNum(lineNum);
 
 			int i = 0;
 			List<ImgInfo> imgList = new ArrayList<>();
@@ -2138,20 +2111,14 @@
 
 					String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
 					String commentText = template.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
-
-					commentText = commentText.replace("[鍘熶环]",
-							MoneyBigDecimalUtil.getWithNoZera(goodsVO.getZkPrice()) + "");
 					if (!goodsVO.isHasCoupon()) {
 						commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
 						commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
-					} else {
-						commentText = commentText.replace("[鍒稿悗浠穄",
-								MoneyBigDecimalUtil.getWithNoZera(goodsVO.getCouponPrice()) + "");
-					}
-					commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n")
-							.replace("\r\n\r\n", "\r\n");
+						commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
+					} 
 
 					CommentInfo commentInfo = new CommentInfo();
+					commentInfo.setNeedSpin(true);
 					commentInfo.setId(UUID.randomUUID().toString().replace("-", ""));
 					commentInfo.setContent(commentText);
 					commentInfo.setTypeEnum(CommentInfoEnum.goodsCoupon);
@@ -2181,6 +2148,7 @@
 					commentInfo2.setContent(text2);
 					commentInfo2.setTypeEnum(CommentInfoEnum.goodsCoupon);
 					commentInfo2.setType("");
+					commentInfo2.setNeedSpin(true);
 
 					List<CommentInfo> commentsNew = new ArrayList<>();
 					commentsNew.add(commentInfo);
@@ -2190,6 +2158,20 @@
 				imgList.add(imgInfo);
 				i++;
 			}
+			
+			int lineNum = 0;
+			if (imgList.size() > 0) {
+				if (imgList.size() == 1) {
+					lineNum = 1;
+				} else if (imgList.size() == 3) {
+					lineNum = 3;
+				} else if (imgList.size() == 2 || imgList.size() == 4) {
+					lineNum = 2;
+				} else {
+					lineNum = 3;
+				}
+			}
+			goodsEvaluate.setLineNum(lineNum);
 
 			goodsEvaluate.setGoods(goodsVO);
 			goodsEvaluate.setImgList(imgList);
@@ -2254,7 +2236,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);
@@ -2274,7 +2256,7 @@
 			return;
 		}
 
-		ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
+		ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
 		paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
 		GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);
 
@@ -2291,7 +2273,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);
@@ -2339,7 +2321,65 @@
 			goodsEvaluateDao.save(goodsEvaluate);
 		}
 	}
+	
+	
+	@Override
+	public void offlineTaoBaoGoods(Long goodsId) {
+		try {
+			if (goodsId == null) {
+				return;
+			}
+			List<GoodsEvaluate> list = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO, goodsId);
+			if (list == null || list.size() == 0) {
+				return;
+			}
+			
+			// 涓嬫灦鍟嗗搧
+			offlineGoods(list, Constant.SOURCE_TYPE_TAOBAO, goodsId);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 
+	@CacheEvict(value = "dynamicCache", allEntries = true)
+	private void offlineGoods(List<GoodsEvaluate> list, int goodsType, Long goodsId) {
+		
+		for (GoodsEvaluate goodsEvaluate : list) {
+			// 鍟嗗搧涓嬫灦
+			GoodsDetailVO goodsDetailVO = goodsEvaluate.getGoods();
+			goodsDetailVO.setState(1);
+		 
+			List<ImgInfo> imgList = goodsEvaluate.getImgList();
+			if (imgList == null || imgList.size() == 0) {
+				goodsEvaluate.setUpdateTime(new Date());
+				goodsEvaluateDao.save(goodsEvaluate);
+				continue;
+			}
+
+			for (ImgInfo imgInfo : imgList) {
+				SimpleGoods simpleGoods = imgInfo.getGoods();
+				if (simpleGoods == null || simpleGoods.getGoodsId() != goodsId
+						|| goodsType != simpleGoods.getGoodsType()) {
+					continue;
+				}
+				simpleGoods.setState(1);
+				GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
+				goodsVO.setState(1);
+				
+				imgInfo.setGoods(simpleGoods);
+				imgInfo.setGoodsVO(goodsVO);
+			}
+
+			goodsEvaluate.setImgList(imgList);
+			goodsEvaluate.setUpdateTime(new Date());
+			goodsEvaluateDao.save(goodsEvaluate);
+		}
+	}
+	
+
+	/**
+	 * 鍒犻櫎宸茶繃鏈熸椂闂�
+	 */
 	private void removeOverdue() {
 		List<GoodsEvaluate> list = goodsEvaluateDao.queryOverdue();
 		if (list == null || list.size() == 0) {
@@ -2361,4 +2401,21 @@
 		}
 	}
 
+	/**
+	 * 鍒犻櫎鍟嗗搧宸蹭笅鏋�-鍗曞搧
+	 */
+	private void removeDownGoods() {
+		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