From a2e287f9bfec6f64bcd1dce4155b0139d1474cb7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 10 六月 2019 12:15:57 +0800
Subject: [PATCH] 设备消息,用户消息总未读消息修改

---
 fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java b/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
index 0d316a9..2084344 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
@@ -10,6 +10,7 @@
 import org.yeshi.utils.DateUtil;
 
 import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
+import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.activity.ActivityService;
 import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
@@ -188,20 +189,17 @@
 				Integer type = activity.getType();
 				if (RecommendActivity.TYPE_SHARE_GOODS == type) {
 					// 鍟嗗搧鍔ㄦ��
-					dynamicInfoService.saveActivityRecommend(activity);
+					dynamicInfoService.insertActivityRecommend(activity);
 					
 					activity.setState(1);
 					activityService.updateByPrimaryKeySelective(activity);
 					
 				} else if (RecommendActivity.TYPE_INVITE == type) {
 					// 閭�璇风礌鏉�
-					String imgUrl = null;
-					List<String> imageList = activityService.getImgByActivityId(activity.getId());
-					if (imageList != null && imageList.size() > 0) {
-						imgUrl = imageList.get(0);
-					}
+					RecommendActivityInviteInfo inviteInfo = activityService.getRecommendActivityInviteInfoByActivityId(activity.getId());
+					activity.setInviteInfo(inviteInfo);
 					
-					dynamicInfoService.insertInviteMaterial(activity.getTitle(), imgUrl, activity.getId(), activity.getActivityUser());
+					dynamicInfoService.insertInviteActivity(activity);
 					
 					activity.setState(1);
 					activityService.updateByPrimaryKeySelective(activity);
@@ -218,4 +216,26 @@
 	}
 	
 	
+	/**
+	 * 姣忓ぉ6鐐瑰ぉ鏇存柊閭�璇风礌鏉�
+	 */
+	@Scheduled(cron = "0 0 6 * * ?")
+	public void insertTimeInvite() {
+		
+		if (!Constant.IS_TASK) {
+			return;
+		}
+		
+		try {
+			dynamicInfoService.insertTimeInvite();
+		} catch (Exception e) {
+			try {
+				LogHelper.errorDetailInfo(e);
+			} catch (Exception e1) {
+				e1.printStackTrace();
+			}
+		}
+	}
+	
+	
 }

--
Gitblit v1.8.0