From da4c766d07a83e62992a0e287b678e13aeb6afda Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 04 十二月 2019 10:28:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java |   35 +++++++++++++++++++++--------------
 1 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
index 25f724f..34364e4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
@@ -27,6 +27,7 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoShop;
 import com.yeshi.fanli.exception.brand.BrandInfoException;
+import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.brand.BrandClassShopService;
 import com.yeshi.fanli.service.inter.brand.BrandGoodsCaheService;
 import com.yeshi.fanli.service.inter.brand.BrandInfoService;
@@ -363,7 +364,7 @@
 			} else {
 				updateInfo.setShopTotal(listshop.size());
 			}
-			
+			updateInfo.setWeight(Math.random() * 1000);
 			brandInfoMapper.updateByPrimaryKeySelective(updateInfo);
 		}
 	}
@@ -376,19 +377,25 @@
 			return;
 
 		for (BrandInfo brandInfo : list) {
-			String name = brandInfo.getName();
-			String searchKey = brandInfo.getSearchKey();
-			if (StringUtil.isNullOrEmpty(name) && StringUtil.isNullOrEmpty(searchKey))
-				continue;
-
-			// 娣诲姞鍟嗗搧
-			BrandInfo numInfo = brandGoodsCaheService.addBrandGoods(brandInfo);
-
-			brandInfo.setGoodsTotal(numInfo.getGoodsTotal());
-			brandInfo.setShopTotal(numInfo.getShopTotal());
-			brandInfo.setUpdateTime(new Date());
-			brandInfo.setWeight(Math.random() * 1000);
-			brandInfoMapper.updateByPrimaryKeySelective(brandInfo);
+			try {
+				String name = brandInfo.getName();
+				String searchKey = brandInfo.getSearchKey();
+				if (StringUtil.isNullOrEmpty(name) && StringUtil.isNullOrEmpty(searchKey))
+					continue;
+				// 娣诲姞鍟嗗搧
+				BrandInfo numInfo = brandGoodsCaheService.addBrandGoods(brandInfo);
+				
+				BrandInfo updateInfo = new BrandInfo(); 
+				updateInfo.setId(brandInfo.getId());
+				updateInfo.setWeight(Math.random() * 1000);
+				updateInfo.setGoodsTotal(numInfo.getGoodsTotal());
+				updateInfo.setShopTotal(numInfo.getShopTotal());
+				updateInfo.setUpdateTime(new Date());
+				brandInfoMapper.updateByPrimaryKeySelective(updateInfo);
+			} catch (Exception e) {
+				LogHelper.errorDetailInfo(e);
+			}
+			
 		}
 	}
 

--
Gitblit v1.8.0