From d126b83f5d65f612ec93475b976fc5b5e2d6132a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 五月 2019 17:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java |  517 ++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 292 insertions(+), 225 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
index f24931c..0dd5c72 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -20,6 +20,7 @@
 import com.yeshi.fanli.dto.taobao.TaoBaoShopDTO;
 import com.yeshi.fanli.entity.bus.activity.ActivityUser;
 import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
+import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;
 import com.yeshi.fanli.entity.bus.activity.RecommendActivityTaoBaoGoods;
 import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
 import com.yeshi.fanli.entity.dynamic.DynamicInfo;
@@ -586,29 +587,48 @@
 		return goodsPicture;
 	}
 
-	@Override
-	public void updateShareCount(DynamicInfo record) {
-		dynamicInfoDao.updateShareCount(record);
-	}
 	
 	
 	@Override
-	public void insertInviteMaterial(String title, String picUrl, Long activityId, ActivityUser activityUser) {
+	public void insertInviteActivity(RecommendActivity activity) throws Exception{
 		
-		DynamicInfo existInfo = null;
-		if (activityId != null) {
-			existInfo = dynamicInfoDao.getByActivityId(activityId);
-			if (existInfo != null) {
-				dynamicInfoDao.deleteById(existInfo.getId());
-			}
+		String title = activity.getTitle();
+		
+		String picUrl = null;
+		List<String> imageList = activity.getImageList();
+		if (imageList != null && imageList.size() > 0) {
+			picUrl = imageList.get(0);
+		}
+		
+		if (StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(picUrl)) {
+			return;
+		}
+		
+		// 鍒ゆ柇鏄惁宸插瓨鍦�
+		String dynamicInfoId = null;
+		
+		Long activityId =  activity.getId();
+		DynamicInfo dynamicVO = dynamicInfoDao.getByActivityId(activityId);
+		if (dynamicVO == null) {
+			dynamicVO = new DynamicInfo();
+			dynamicVO.setId(UUID.randomUUID().toString().replace("-", ""));
+			dynamicVO.setCreateTime(DateUtil.reduceRandomMinute(new Date(), 8));
+		} else {
+			dynamicInfoId = dynamicVO.getId();
+		}
+		
+		if (!StringUtil.isNullOrEmpty(title)) {
+			title = title.replaceAll("<p>", "");
+			title = title.replaceAll("</p>", "");
+			title = title.replaceAll("<br>", "\n");
 			
-			if (!StringUtil.isNullOrEmpty(title)) {
-				title = title.replace("<p>", "");
-				title = title.replace("</p>", "");
+			int index = title.lastIndexOf("\n");
+			String newDesc = title.substring(index + 1);
+			if(StringUtil.isNullOrEmpty(newDesc)) {
+				title = title.substring(0, index);
 			}
 		}
 		
-		DynamicInfo dynamicVO = new DynamicInfo();
 		dynamicVO.setId(UUID.randomUUID().toString().replace("-", ""));
 		dynamicVO.setActivityId(activityId);
 		dynamicVO.setClassId(4L);
@@ -616,256 +636,133 @@
 		dynamicVO.setShareType(DynamicInfo.SHARE_TYPE_INVITE);
 		dynamicVO.setUpdateTime(new Date());
 		
-		if (existInfo != null) {
-			dynamicVO.setCreateTime(existInfo.getCreateTime());
-			dynamicVO.setShareCount(existInfo.getShareCount());
-		} else {
-			dynamicVO.setCreateTime(DateUtil.reduceRandomMinute(new Date(), 8));
+		
+		Integer shareCount = activity.getShareCount();
+		if (shareCount == null || shareCount <= 0) {
 			dynamicVO.setShareCount(1000 + (int) (Math.random() * 8000));
+		} else {
+			dynamicVO.setShareCount(shareCount);
 		}
 		
+		// 鍙戝竷鐢ㄦ埛
+		ActivityUser activityUser = activity.getActivityUser();
 		if (activityUser == null) {
-			dynamicVO.setUser(activityUserService.listRand(1).get(0));
+			dynamicVO.setUser(activityUserService.selectByPrimaryKey(2L));
 		} else {
 			dynamicVO.setUser(activityUser);
 		}
 		
 		
+		// 浠嬬粛鍐呭
 		List<ClientTextStyleVO> listtitle = new ArrayList<ClientTextStyleVO>();
-		
-				
-		List<GoodsPicture> listImg = new ArrayList<GoodsPicture>();
-		if(StringUtil.isNullOrEmpty(picUrl)) {
-			dynamicVO.setImgs(listImg);
-			dynamicVO.setShowType(DynamicInfo.SHOW_TYPE_ZERO);
-			
-			// 浠嬬粛鍐呭
-			SimpleDateFormat format = new SimpleDateFormat("MM鏈坉d鏃�");
-			StringBuffer buffer = new StringBuffer();
-			buffer.append("-------------------\n");
-			buffer.append("浠婂ぉ : " + format.format(new Date()));
-			buffer.append("     ");
-			buffer.append(DateLunarUtil.getWeekd(new Date()) + "\n");
-			buffer.append("鍚勪綅浜茬埍鐨勪綘");
-			buffer.append("         ");
-			buffer.append("鏃╁畨锝瀄n");
-			buffer.append("鎴戠殑閭�璇风爜锛氥�愰個璇风爜銆慭n");
-			buffer.append("璐墿鐪侀挶杩斿埄鍒窤pp锛氥�愰個璇烽摼鎺ャ��");
-        
+		if(!StringUtil.isNullOrEmpty(title)) {
 			ClientTextStyleVO row1 = new ClientTextStyleVO();
 			row1.setColor("#333333");
-			row1.setContent(title + "\n" + buffer.toString());
-			
+			row1.setContent(title );
 			listtitle.add(row1);
-			dynamicVO.setTitle(listtitle);
-			dynamicInfoDao.insert(dynamicVO);
+		}
+		
+		
+		// 鍥剧墖
+		List<GoodsPicture> listImg = new ArrayList<GoodsPicture>();
+		if(StringUtil.isNullOrEmpty(picUrl)) {
+			dynamicVO.setShowType(DynamicInfo.SHOW_TYPE_ZERO);
 		} else {
-			try {
-				dynamicVO.setTitle(listtitle);
-				dynamicVO.setShowType(DynamicInfo.SHOW_TYPE_ONE);
-				
-				// 鍥剧墖
-				String imgLink = qrCodeService.drawInviteQrCodeNew(picUrl , null, null, null);
-				GoodsPicture p2 = new GoodsPicture();
-				p2.setW(100);
-				p2.setH(100);
-				p2.setUrl(imgLink);
-				p2.setUrlOriginal(picUrl);
-				listImg.add(p2);
-				dynamicVO.setImgs(listImg);
-				
-				
-				dynamicInfoDao.insert(dynamicVO);
-			} catch (Exception e) {
-				try {
-					LogHelper.errorDetailInfo(e);
-				} catch (Exception e1) {
-					e1.printStackTrace();
-				}
+			dynamicVO.setShowType(DynamicInfo.SHOW_TYPE_ONE);
+			RecommendActivityInviteInfo inviteInfo = activity.getInviteInfo();
+			
+			Integer pX = null; 
+			Integer pY = null;
+			Integer size = null;
+			if (inviteInfo != null) {
+				pX = inviteInfo.getPx();
+				pY = inviteInfo.getPy();
+				size = inviteInfo.getSize();
 			}
+			
+			// 鍥剧墖
+			String imgLink = qrCodeService.drawInviteQrCodeNew(picUrl , null, null, pX, pY, size, null);
+			GoodsPicture p2 = new GoodsPicture();
+			p2.setW(100);
+			p2.setH(100);
+			p2.setUrl(imgLink);
+			p2.setUrlOriginal(picUrl);
+			p2.setPx(pX);
+			p2.setPy(pY);
+			p2.setSize(size);
+			
+			listImg.add(p2);
 		}
 		
-	}
-	
-	
-	
-	@Override
-	public void removeByDate(Date createTime) {
-		dynamicInfoDao.removeByDate(createTime);
-	}
-	
-	
-	
-	/**
-	 * 鏇存柊鍟嗗搧淇℃伅
-	 */
-	public void updateGoodInfo(List<DynamicInfo> list) {
-		if (list == null || list.size() == 0) {
-			return;
+		dynamicVO.setImgs(listImg);
+		dynamicVO.setTitle(listtitle);
+		
+		if (!StringUtil.isNullOrEmpty(dynamicInfoId)) {
+			dynamicInfoDao.deleteById(dynamicInfoId);
 		}
 		
-		BigDecimal proportion = hongBaoManageService.getFanLiRate();
-		for (DynamicInfo dynamicInfo: list) {
-			// 閭�璇锋暟鎹笉鍋氭洿鏂�
-			long classId = dynamicInfo.getClassId();
-			if (classId == 4) {
-				break;
-			}
-			
-			// 鏇存柊鍟嗗搧淇℃伅
-			List<GoodsPicture> imgs = dynamicInfo.getImgs();
-			if (imgs == null || imgs.size() == 0) {
-				continue;
-			}
-			
-			// 鏄惁涓�涓皬鏃朵箣鍐呭凡鏇存柊
-			Date updateTime = dynamicInfo.getUpdateTime();
-			if (updateTime != null) {
-				long nd = 1000 * 24 * 60 * 60;// 涓�澶╃殑姣鏁�    
-				long nh = 1000 * 60 * 60;// 涓�灏忔椂鐨勬绉掓暟    
-				long diff = System.currentTimeMillis() - updateTime.getTime();    
-				long day = diff / nd;// 璁$畻宸灏戝ぉ    
-				long hour = diff % nd / nh + day * 24;// 璁$畻宸灏戝皬鏃�    
-				if (hour < 1) {
-					continue;
-				}
-			}
-			
-			// 鍟嗗搧鍒楄〃
-			List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
-						
-			for (GoodsPicture goodsPicture: imgs) {
-				TaoBaoGoodsBriefExtra oldExtra = goodsPicture.getGoods();
-				if (oldExtra == null) {
-					continue;
-				}
-				
-				Integer state = oldExtra.getState();
-				if (state != null && state == 1) {
-					continue;
-				}
-				
-				try {
-					TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(oldExtra.getAuctionId());
-					listGoods.add(goodsBrief);
-					
-					// 鏇存柊鐑攢鍗曞搧鐨勫垎浜閲�  锛屽叾浣欎笉鍋氭洿鏂�
-					if (classId == 1) {
-						BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(goodsBrief);
-						ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
-						shareMoneyDesc.setColor("#FFFFFF");
-						shareMoneyDesc.setBottomColor("#E8AE48");
-						shareMoneyDesc.setContent("棰勪及鍒嗕韩濂栭噾锛毬�" + shareMoney);
-						dynamicInfo.setDesc(shareMoneyDesc);
-					}
-					
-					TaoBaoGoodsBriefExtra newExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null);
-					
-					if (!newExtra.isCoupon()) {
-						newExtra.setState(1);
-					}
-					newExtra.setUpdatetime(new Date());
-					goodsPicture.setGoods(newExtra);
-					
-				} catch (TaobaoGoodsDownException e) {
-					oldExtra.setState(1);
-					oldExtra.setCoupon(false);
-					oldExtra.setUpdatetime(new Date());
-					goodsPicture.setGoods(oldExtra);
-					
-					// 鏇存柊鐑攢鍗曞搧鐨勫垎浜閲�  锛屽叾浣欎笉鍋氭洿鏂�
-					if (classId == 1) {
-						ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
-						shareMoneyDesc.setColor("#FFFFFF");
-						shareMoneyDesc.setBottomColor("#E8AE48");
-						shareMoneyDesc.setContent("棰勪及鍒嗕韩濂栭噾锛毬�" + new BigDecimal(0));
-						dynamicInfo.setDesc(shareMoneyDesc);
-					}
-					e.printStackTrace();
-				}
-			}
-			
-			
-			
-			// 鏇存柊鍟嗗搧
-			List<TaoBaoGoodsBrief> listGoodsBrief = dynamicInfo.getListGoodsBrief();
-			if (listGoods != null && listGoods.size() > 0 && listGoodsBrief != null && listGoodsBrief.size() > 0) {
-				
-				if (classId == 1) {
-					dynamicInfo.setListGoodsBrief(listGoods);
-				} else {
-					for (int i =0; i < listGoodsBrief.size(); i ++) {
-						TaoBaoGoodsBrief taoBaoGoodsBrief = listGoodsBrief.get(i);
-						Long auctionId = taoBaoGoodsBrief.getAuctionId();
-						
-						boolean isadd = true;
-						for (TaoBaoGoodsBrief goods: listGoods) {
-							if(goods.getAuctionId().equals(auctionId) || goods.getAuctionId() == auctionId) {
-								isadd = false;
-								break;
-							} 
-						}
-						
-						// 鍟嗗搧宸蹭笅鏋� 鍒欐坊鍔犲師鏉ュ晢鍝佷俊鎭�
-						if (isadd) {
-							listGoods.add(taoBaoGoodsBrief);
-						}
-					}
-					dynamicInfo.setListGoodsBrief(listGoods);
-				}
-			}
-			
-			dynamicInfo.setImgs(imgs);
-			dynamicInfo.setUpdateTime(new Date());
-			dynamicInfoDao.updateGoodInfo(dynamicInfo);
-		}
+		dynamicInfoDao.insert(dynamicVO);
 	}
 	
 	
 	@Override
-	public void deleteActivity(Long activityId) {
-		DynamicInfo dynamicInfo = dynamicInfoDao.getByActivityId(activityId);
-		if (dynamicInfo != null) {
-			// 鍒犻櫎涔嬪墠鐨�
-			dynamicInfoDao.deleteById(dynamicInfo.getId());
-		}
-	}
-	
-	
-
-	@Override
-	public void saveActivityRecommend(RecommendActivity activity) {
+	public void insertActivityRecommend(RecommendActivity activity) {
 		if (activity == null || activity.getGoodsList() == null) {
 			return;
 		}
 		
 		try {
-			DynamicInfo existInfo = dynamicInfoDao.getByActivityId(activity.getId());
-			if (existInfo != null) {
-				dynamicInfoDao.deleteById(existInfo.getId());
+			String dynamicInfoId = null;
+			DynamicInfo dynamicInfo = dynamicInfoDao.getByActivityId(activity.getId());
+			if (dynamicInfo == null) {
+				dynamicInfo = new DynamicInfo();
+				dynamicInfo.setId(UUID.randomUUID().toString().replace("-", ""));
+				dynamicInfo.setCreateTime(new Date());
+			} else {
+				dynamicInfoId = dynamicInfo.getId();
 			}
 			
-			DynamicInfo dynamicInfo = new DynamicInfo();
-			dynamicInfo.setId(UUID.randomUUID().toString().replace("-", ""));
 			dynamicInfo.setClassId(2L);
 			dynamicInfo.setSubclassId(0L);
 			dynamicInfo.setUser(activity.getActivityUser());
 			dynamicInfo.setActivityId(activity.getId());
+			dynamicInfo.setUpdateTime(new Date());
 			
+			
+			List<ClientTextStyleVO> listtitle = new ArrayList<ClientTextStyleVO>();
 			String title = activity.getTitle();
 			if (!StringUtil.isNullOrEmpty(title)) {
-				title = title.replace("<p>", "");
-				title = title.replace("</p>", "");
-				dynamicInfo.setTitle(convertIntroduce(title));
+				title = title.replaceAll("<p>", "");
+				title = title.replaceAll("</p>", "");
+				title = title.replaceAll("<br>", "\n");
+				
+				int index = title.lastIndexOf("\n");
+				String newDesc = title.substring(index + 1);
+				if(StringUtil.isNullOrEmpty(newDesc)) {
+					title = title.substring(0, index);
+				}
+				
+				ClientTextStyleVO row1 = new ClientTextStyleVO();
+				row1.setColor("#333333");
+				row1.setContent(title );
+				listtitle.add(row1);
+			}
+			dynamicInfo.setTitle(listtitle);
+			
+			
+			Integer shareCount = activity.getShareCount();
+			if (shareCount == null || shareCount <= 0) {
+				dynamicInfo.setShareCount(1000 + (int) (Math.random() * 8000));
+			} else {
+				dynamicInfo.setShareCount(shareCount);
 			}
 			
-			if (existInfo != null) {
-				dynamicInfo.setCreateTime(existInfo.getCreateTime());
-				dynamicInfo.setShareCount(existInfo.getShareCount());
+			// 鍙戝竷鐢ㄦ埛
+			ActivityUser activityUser = activity.getActivityUser();
+			if (activityUser == null) {
+				dynamicInfo.setUser(activityUserService.selectByPrimaryKey(2L));
 			} else {
-				dynamicInfo.setCreateTime(new Date());
-				dynamicInfo.setUpdateTime(new Date());
-				dynamicInfo.setShareCount(1000 + (int) (Math.random() * 8000));
+				dynamicInfo.setUser(activityUser);
 			}
 
 			List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
@@ -935,6 +832,11 @@
 				dynamicInfo.setShowType(DynamicInfo.SHOW_TYPE_THREE);
 				dynamicInfo.setShareType(DynamicInfo.SHARE_TYPE_NINE); // 鍒嗕韩绫诲瀷9鍥�
 			}
+			
+			
+			if (!StringUtil.isNullOrEmpty(dynamicInfoId)) {
+				dynamicInfoDao.deleteById(dynamicInfoId);
+			}
 			// 淇濆瓨淇℃伅
 			dynamicInfoDao.insert(dynamicInfo);
 
@@ -948,6 +850,25 @@
 	}
 	
 	
+	@Override
+	public void deleteActivity(Long activityId) {
+		DynamicInfo dynamicInfo = dynamicInfoDao.getByActivityId(activityId);
+		if (dynamicInfo != null) {
+			// 鍒犻櫎涔嬪墠鐨�
+			dynamicInfoDao.deleteById(dynamicInfo.getId());
+		}
+	}
+	
+	
+	@Override
+	public void removeByDate(Date createTime) {
+		dynamicInfoDao.removeByDate(createTime);
+	}
+	
+	@Override
+	public void updateShareCount(DynamicInfo record) {
+		dynamicInfoDao.updateShareCount(record);
+	}
 	
 	@Override
 	@Cacheable(value = "dynamicCache", key = "'count-'+#cid+'-'+#subId")
@@ -970,4 +891,150 @@
 		
 		return list;
 	}
+	
+	
+	/**
+	 * 鏇存柊鍟嗗搧淇℃伅
+	 */
+	public void updateGoodInfo(List<DynamicInfo> list) {
+		if (list == null || list.size() == 0) {
+			return;
+		}
+		
+		BigDecimal proportion = hongBaoManageService.getFanLiRate();
+		for (DynamicInfo dynamicInfo: list) {
+			// 閭�璇锋暟鎹笉鍋氭洿鏂�
+			long classId = dynamicInfo.getClassId();
+			if (classId == 4) {
+				break;
+			}
+			
+			// 鏇存柊鍟嗗搧淇℃伅
+			List<GoodsPicture> imgs = dynamicInfo.getImgs();
+			if (imgs == null || imgs.size() == 0) {
+				continue;
+			}
+			
+			// 鏄惁涓�涓皬鏃朵箣鍐呭凡鏇存柊
+			Date updateTime = dynamicInfo.getUpdateTime();
+			if (updateTime != null) {
+				long nd = 1000 * 24 * 60 * 60;// 涓�澶╃殑姣鏁�    
+				long nh = 1000 * 60 * 60;// 涓�灏忔椂鐨勬绉掓暟    
+				long diff = System.currentTimeMillis() - updateTime.getTime();    
+				long day = diff / nd;// 璁$畻宸灏戝ぉ    
+				long hour = diff % nd / nh + day * 24;// 璁$畻宸灏戝皬鏃�    
+				if (hour < 1) {
+					continue;
+				}
+			}
+			
+			// 宸蹭笅鏋禝D
+			List<Long> listDown = new ArrayList<Long>();
+			// 鍟嗗搧鍒楄〃
+			List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
+						
+			for (GoodsPicture goodsPicture: imgs) {
+				TaoBaoGoodsBriefExtra oldExtra = goodsPicture.getGoods();
+				if (oldExtra == null) {
+					continue;
+				}
+				
+				Integer state = oldExtra.getState();
+				if (state != null && state == 1) {
+					continue;
+				}
+				
+				try {
+					TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(oldExtra.getAuctionId());
+					listGoods.add(goodsBrief);
+					
+					// 鏇存柊鐑攢鍗曞搧鐨勫垎浜閲�  锛屽叾浣欎笉鍋氭洿鏂�
+					if (classId == 1) {
+						BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(goodsBrief);
+						ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
+						shareMoneyDesc.setColor("#FFFFFF");
+						shareMoneyDesc.setBottomColor("#E8AE48");
+						shareMoneyDesc.setContent("棰勪及鍒嗕韩濂栭噾锛毬�" + shareMoney);
+						dynamicInfo.setDesc(shareMoneyDesc);
+					}
+					
+					TaoBaoGoodsBriefExtra newExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null);
+					
+					if (!newExtra.isCoupon()) {
+						newExtra.setState(1);
+					}
+					newExtra.setUpdatetime(new Date());
+					goodsPicture.setGoods(oldExtra);
+					
+				} catch (TaobaoGoodsDownException e) {
+					listDown.add(oldExtra.getAuctionId());
+					
+					oldExtra.setState(1);
+					oldExtra.setCoupon(false);
+					oldExtra.setUpdatetime(new Date());
+					goodsPicture.setGoods(oldExtra);
+					
+					// 鍟嗗搧鐪熷疄涓嬫灦
+					goodsPicture.setGoodState(1);
+					
+					// 鏇存柊鐑攢鍗曞搧鐨勫垎浜閲�  锛屽叾浣欎笉鍋氭洿鏂�
+					if (classId == 1) {
+						ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
+						shareMoneyDesc.setColor("#FFFFFF");
+						shareMoneyDesc.setBottomColor("#E8AE48");
+						shareMoneyDesc.setContent("棰勪及鍒嗕韩濂栭噾锛毬�" + new BigDecimal(0));
+						dynamicInfo.setDesc(shareMoneyDesc);
+					}
+					e.printStackTrace();
+				}
+			}
+			dynamicInfo.setImgs(imgs);
+			
+			// 鍟嗗搧宸蹭笅鏋�
+			List<TaoBaoGoodsBrief> listGoodsBrief = dynamicInfo.getListGoodsBrief();
+			if (listGoodsBrief != null && listGoodsBrief.size() > 0) {
+				
+				if (listGoods.size() > 0 ) {
+					if (classId == 1) {
+						dynamicInfo.setListGoodsBrief(listGoods);
+					} else {
+						for (int i =0; i < listGoodsBrief.size(); i ++) {
+							TaoBaoGoodsBrief taoBaoGoodsBrief = listGoodsBrief.get(i);
+							Long auctionId = taoBaoGoodsBrief.getAuctionId();
+							
+							boolean isadd = true;
+							for (TaoBaoGoodsBrief goods: listGoods) {
+								if(goods.getAuctionId().equals(auctionId) || goods.getAuctionId() == auctionId) {
+									isadd = false;
+									break;
+								} 
+							}
+							
+							if (isadd) {
+								// 鍟嗗搧宸蹭笅鏋� 鍒欐坊鍔犲師鏉ュ晢鍝佷俊鎭�
+								if (listDown.size() > 0 && listDown.contains(taoBaoGoodsBrief.getAuctionId())) {
+									taoBaoGoodsBrief.setState(1);
+								}
+								listGoods.add(taoBaoGoodsBrief);
+							}
+						}
+						dynamicInfo.setListGoodsBrief(listGoods);
+					}
+				} else {
+					if (listDown.size() > 0) {
+						for (TaoBaoGoodsBrief taoBaoGoodsBrief: listGoodsBrief) {
+							if (listDown.contains(taoBaoGoodsBrief.getAuctionId())) {
+								taoBaoGoodsBrief.setState(1);
+							}
+						}
+						dynamicInfo.setListGoodsBrief(listGoodsBrief);
+					}
+				}
+			}
+			
+			dynamicInfo.setUpdateTime(new Date());
+			dynamicInfoDao.updateGoodInfo(dynamicInfo);
+		}
+	}
+	
 }

--
Gitblit v1.8.0