Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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);

@@ -218,4 +217,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();

         }

      }

   }

	
	
}