From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 2d438a0..30a0aed 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;
@@ -148,7 +149,7 @@
/**
* 姣忓ぉ闆剁偣鍒犻櫎3澶╀箣鍓嶆暟鎹�
*/
- @Scheduled(cron = "0 0 0 * * ?")
+ @Scheduled(cron = "0 0 1,10 * * ?")
public void remove() {
if (!Constant.IS_TASK) {
@@ -156,7 +157,8 @@
}
try {
- dynamicInfoService.removeByDate(DateUtil.reduceDay(3, new Date()));
+ LogHelper.test("DynamicInfoJob-remove-寮�濮嬫墽琛屾��");
+ dynamicInfoService.removeByDate(DateUtil.reduceDay(2, new Date()));
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -188,20 +190,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);
--
Gitblit v1.8.0