From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java |   67 ++++++++++++++++++++-------------
 1 files changed, 40 insertions(+), 27 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 cd96f93..52f9a53 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
+++ b/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;
@@ -64,9 +65,9 @@
 
 	@Resource
 	private GoodsEvaluateService goodsEvaluateService;
-	  
+
 	/**
-	 * 姣�10鍒嗛挓  鏅氫笂00:00~06:00涓嶄笅鍙戜换浣曚竴涓晢鍝�
+	 * 姣�10鍒嗛挓 鏅氫笂00:00~06:00涓嶄笅鍙戜换浣曚竴涓晢鍝�
 	 */
 	@Scheduled(cron = "0 0/10 6-23 * * ?")
 	public void insetDynamicInfo() {
@@ -203,7 +204,7 @@
 	}
 
 	/**
-	 *  鍚庡彴缂栬緫鍔ㄦ�侊細 姣�3鍒嗛挓妫�绱�
+	 * 鍚庡彴缂栬緫鍔ㄦ�侊細 姣�3鍒嗛挓妫�绱�
 	 */
 	@Scheduled(cron = "0 0/3 * * * ?")
 	public void activityNeedPublish() {
@@ -272,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 {
@@ -287,11 +283,7 @@
 	}
 
 	/**
-	 * 娣诲姞鍐呬紭鎯犵浉鍏冲晢鍝�
-	 * @Title: addJDNYHInfo
-	 * @Description:  
-	 * void 杩斿洖绫诲瀷
-	 * @throws
+	 * 娣诲姞鍐呬紭鎯犵浉鍏冲晢鍝� @Title: addJDNYHInfo @Description: void 杩斿洖绫诲瀷 @throws
 	 */
 	private void addJDNYHInfo() throws Exception {
 
@@ -326,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);
@@ -356,18 +348,17 @@
 			wxmpDynamicInfoService.addWXMPDynamicInfo(info);
 		}
 	}
-	
-	
-	/**
-	 * 鑷姩鐢熸垚鍙戝湀
-	 * 鏃╀笂6,7,15,16,21,22,23鐐规洿鏂�1娆�
-	 */
-	@Scheduled(cron = "0 0 6,7,15,16,21,22,23 * * ? ")
-	public void insetEvaluate() {
-		if (!Constant.IS_TASK) {
-			return;
-		}
 
+	/**
+	 * 鍔ㄦ�佸彂鍦�
+	 * 
+	 * @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) {
@@ -377,6 +368,28 @@
 				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();
+			}
+		}
+	}
 }

--
Gitblit v1.8.0