Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java

@@ -16,6 +16,7 @@
import com.yeshi.fanli.dto.ConfigParamsDTO;

import com.yeshi.fanli.entity.bus.activity.RecommendActivity;

import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.dynamic.GoodsPicture;

import com.yeshi.fanli.entity.dynamic.WXMPDynamicInfo;

import com.yeshi.fanli.entity.goods.jd.NYouHuiGoods;

@@ -25,6 +26,7 @@
import com.yeshi.fanli.service.inter.activity.ActivityUserService;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;

import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;

import com.yeshi.fanli.service.inter.dynamic.WXMPDynamicInfoService;

import com.yeshi.fanli.service.inter.goods.jd.NYouHuiService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

@@ -51,7 +53,7 @@


   @Resource

   private WXMPDynamicInfoService wxmpDynamicInfoService;

	


   @Resource

   private ConvertLinkManager convertLinkManager;



@@ -61,8 +63,11 @@
   @Resource

   private JumpDetailV2Service jumpDetailV2Service;



   @Resource

   private GoodsEvaluateService goodsEvaluateService;



   /**

    * 每10分钟  晚上00:00~06:00不下发任何一个商品

    * 每10分钟 晚上00:00~06:00不下发任何一个商品

    */

   @Scheduled(cron = "0 0/10 6-23 * * ?")

   public void insetDynamicInfo() {

@@ -199,7 +204,7 @@
   }



   /**

    *  后台编辑动态： 每3分钟检索

    * 后台编辑动态： 每3分钟检索

    */

   @Scheduled(cron = "0 0/3 * * * ?")

   public void activityNeedPublish() {

@@ -268,13 +273,8 @@


   /**

    * 

    * @Title: demoJobHandler

    * @Description: 更新小程序动态商品

    * @param param

    * @return

    * @throws Exception 
    * ReturnT<String> 返回类型

    * @throws

    * @Title: demoJobHandler @Description: 更新小程序动态商品 @param

    * param @return @throws Exception ReturnT<String> 返回类型 @throws

    */

   @XxlJob("dynamic-updateWXMPDynamicInfo")

   public ReturnT<String> updateWXMPDynamicInfoHandler(String param) throws Exception {

@@ -282,13 +282,8 @@
      return ReturnT.SUCCESS;

   }





   /**

    * 添加内优惠相关商品

    * @Title: addJDNYHInfo

    * @Description:  
    * void 返回类型

    * @throws

    * 添加内优惠相关商品 @Title: addJDNYHInfo @Description: void 返回类型 @throws

    */

   private void addJDNYHInfo() throws Exception {



@@ -323,7 +318,7 @@
                  GoodsDetailVOFactory.convertJDGoods(jdGoods,

                        new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),

                              hongBaoManageService.getShareRate(), null,

                              hongBaoManageService.getVIPFanLiRate())));

                              hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP))));

            picture.setGoodState(0);

            picture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail"));

            picture.setParams(null);

@@ -335,6 +330,7 @@
               else if (jdGoods.getImageList().size() > 1)

                  lastPicture.addAll(jdGoods.getImageList().subList(1, jdGoods.getImageList().size()));

         }

         info.setShareMoney(totalMoney);

         int count = 0;

         while (imgs.size() < 4 && count < 4) {

            count++;

@@ -353,4 +349,47 @@
      }

   }



   /**

    * 动态发圈

    * 
    * @param param

    * @return

    * @throws Exception

    */

   // @Scheduled(cron = "0 0 6,7,15,16,21,22,23 * * ? ")

   @XxlJob("dynamic-insertEvaluate")

   public ReturnT<String> insertEvaluate(String param) throws Exception {

      try {

         goodsEvaluateService.addGoodsEvaluateByDaTaoKe();

      } catch (Exception e) {

         try {

            LogHelper.errorDetailInfo(e);

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      }

      return ReturnT.SUCCESS;

   }



	
   /**

    *  每一个小时随机在分享数的基础上加10~100。增加的时间段是每天8~22点。

    * 早上6,7,15,16,21,22,23点更新1次

    */

   @Scheduled(cron = "0 0 8,9,10,11,12,13,14,15,16,17,18,19,20,21,22 * * ? ")

   public void addRanDomShareCount() {

      if (!Constant.IS_TASK) {

         return;

      }



      try {

         goodsEvaluateService.addRanDomShareCount();

      } catch (Exception e) {

         try {

            LogHelper.errorDetailInfo(e);

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      }

   }

}