From 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 五月 2019 10:28:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java |   53 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 11 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 4a9332f..9797aa5 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
@@ -1,6 +1,5 @@
 package com.yeshi.fanli.service.impl.dynamic;
 
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -185,8 +184,12 @@
 				dynamicPic.setImgs(listImg);
 				
 				dynamicInfoDao.insert(dynamicPic);
-			} catch (IOException e) {
-				e.printStackTrace();
+			} catch (Exception e) {
+				try {
+					LogHelper.errorDetailInfo(e);
+				} catch (Exception e1) {
+					e1.printStackTrace();
+				}
 			}
 		}
 		// 鏇存柊绱犳潗鐘舵��
@@ -320,7 +323,7 @@
 			int cid = Integer.parseInt(subclassId +"");
 			int count = 0;
 			double random = Math.random();
-			if (random > 0.5) {
+			if (random > 0.4) {
 				count = 9;
 			} else {
 				count = 4;
@@ -385,7 +388,11 @@
 			dynamicInfoDao.insert(dynamicInfo);
 
 		} catch (Exception e) {
-			e.printStackTrace();
+			try {
+				LogHelper.errorDetailInfo(e);
+			} catch (Exception e1) {
+				e1.printStackTrace();
+			}
 		}
 	}
 
@@ -396,7 +403,11 @@
 		try {
 			saveHotSale(classId, 0L);
 		} catch (Exception e) {
-			e.printStackTrace();
+			try {
+				LogHelper.errorDetailInfo(e);
+			} catch (Exception e1) {
+				e1.printStackTrace();
+			}
 		}
 
 		// 鐑攢鍗曞搧鐨勫垎绫�
@@ -405,7 +416,11 @@
 			try {
 				saveHotSale(classId, goodsClass.getId());
 			} catch (Exception e) {
-				e.printStackTrace();
+				try {
+					LogHelper.errorDetailInfo(e);
+				} catch (Exception e1) {
+					e1.printStackTrace();
+				}
 			}
 		}
 	}
@@ -484,13 +499,21 @@
 
 		// 缁勭粐鍔ㄦ�佷俊鎭�
 		DynamicInfo dynamicInfo = getDynamicInfo(daTaoKe, classId, subclassId);
-		dynamicInfo.setTitle(convertIntroduce(DaTaoKeUtil.getDesc(daTaoKe)));
-		// 鍙戝竷鐢ㄦ埛
 		dynamicInfo.setUser(activityUserService.getRandomByDaTaoKeCid(daTaoKe.getCid()));
 		dynamicInfo.setImgs(listPicture);
 		dynamicInfo.setDesc(shareMoneyDesc);
 		dynamicInfo.setShareType(DynamicInfo.SHARE_TYPE_ONE);
 		dynamicInfo.setShowType(DynamicInfo.SHOW_TYPE_TWO);
+		
+		String desc = DaTaoKeUtil.getDesc(daTaoKe);
+		if (!StringUtil.isNullOrEmpty(desc)) {
+			int index = desc.lastIndexOf("\n");
+			String newDesc = desc.substring(index + 1);
+			if(StringUtil.isNullOrEmpty(newDesc)) {
+				desc = desc.substring(0, index);
+			}
+		}
+		dynamicInfo.setTitle(convertIntroduce(desc));
 
 		// 淇濆瓨淇℃伅
 		dynamicInfoDao.insert(dynamicInfo);
@@ -632,7 +655,11 @@
 				
 				dynamicInfoDao.insert(dynamicVO);
 			} catch (Exception e) {
-				e.printStackTrace();
+				try {
+					LogHelper.errorDetailInfo(e);
+				} catch (Exception e1) {
+					e1.printStackTrace();
+				}
 			}
 		}
 		
@@ -851,7 +878,11 @@
 			dynamicInfoDao.insert(dynamicInfo);
 
 		} catch (Exception e) {
-			e.printStackTrace();
+			try {
+				LogHelper.errorDetailInfo(e);
+			} catch (Exception e1) {
+				e1.printStackTrace();
+			}
 		}
 	}
 	

--
Gitblit v1.8.0