From dd24286b6da752433ba5b2360929a04e5040936c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 29 五月 2019 10:57:15 +0800
Subject: [PATCH] 叮咚呛修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java |   65 +++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 23 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 574dac7..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
@@ -928,6 +928,8 @@
 				}
 			}
 			
+			// 宸蹭笅鏋禝D
+			List<Long> listDown = new ArrayList<Long>();
 			// 鍟嗗搧鍒楄〃
 			List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
 						
@@ -962,9 +964,11 @@
 						newExtra.setState(1);
 					}
 					newExtra.setUpdatetime(new Date());
-					goodsPicture.setGoods(newExtra);
+					goodsPicture.setGoods(oldExtra);
 					
 				} catch (TaobaoGoodsDownException e) {
+					listDown.add(oldExtra.getAuctionId());
+					
 					oldExtra.setState(1);
 					oldExtra.setCoupon(false);
 					oldExtra.setUpdatetime(new Date());
@@ -984,35 +988,50 @@
 					e.printStackTrace();
 				}
 			}
+			dynamicInfo.setImgs(imgs);
 			
-			// 鏇存柊鍟嗗搧
+			// 鍟嗗搧宸蹭笅鏋�
 			List<TaoBaoGoodsBrief> listGoodsBrief = dynamicInfo.getListGoodsBrief();
-			if (listGoods != null && listGoods.size() > 0 && listGoodsBrief != null && listGoodsBrief.size() > 0) {
+			if (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 (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);
+							}
 						}
-						
-						// 鍟嗗搧宸蹭笅鏋� 鍒欐坊鍔犲師鏉ュ晢鍝佷俊鎭�
-						if (isadd) {
-							listGoods.add(taoBaoGoodsBrief);
-						}
+						dynamicInfo.setListGoodsBrief(listGoods);
 					}
-					dynamicInfo.setListGoodsBrief(listGoods);
+				} else {
+					if (listDown.size() > 0) {
+						for (TaoBaoGoodsBrief taoBaoGoodsBrief: listGoodsBrief) {
+							if (listDown.contains(taoBaoGoodsBrief.getAuctionId())) {
+								taoBaoGoodsBrief.setState(1);
+							}
+						}
+						dynamicInfo.setListGoodsBrief(listGoodsBrief);
+					}
 				}
 			}
-			dynamicInfo.setImgs(imgs);
+			
 			dynamicInfo.setUpdateTime(new Date());
 			dynamicInfoDao.updateGoodInfo(dynamicInfo);
 		}

--
Gitblit v1.8.0