From 621852b97817fec5ae49cba443cb6d7e6069d3ca Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 16 六月 2020 17:22:06 +0800
Subject: [PATCH] 云发单教程跳转bug
---
fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java | 100 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 88 insertions(+), 12 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 a2810b9..977fb72 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
@@ -14,12 +14,20 @@
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult;
+import com.yeshi.fanli.dto.taobao.haodanku.HDKGoodsListResultDTO;
+import com.yeshi.fanli.entity.bus.activity.ActivityRuleUser;
+import com.yeshi.fanli.entity.bus.activity.ActivityUser;
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;
import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
+import com.yeshi.fanli.entity.taobao.haodanku.HDKGoodsDetail;
+import com.yeshi.fanli.exception.dynamic.GoodsEvaluateException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.activity.ActivityService;
import com.yeshi.fanli.service.inter.activity.ActivityUserService;
@@ -28,12 +36,15 @@
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.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.jd.JDUtil;
+import com.yeshi.fanli.util.taobao.HaoDanKuApiUtil;
@Component
public class DynamicInfoJob {
@@ -64,6 +75,9 @@
@Resource
private GoodsEvaluateService goodsEvaluateService;
+
+ @Resource
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
/**
* 姣�10鍒嗛挓 鏅氫笂00:00~06:00涓嶄笅鍙戜换浣曚竴涓晢鍝�
@@ -207,7 +221,6 @@
*/
@Scheduled(cron = "0 0/3 * * * ?")
public void activityNeedPublish() {
-
if (!Constant.IS_TASK) {
return;
}
@@ -254,7 +267,6 @@
*/
@Scheduled(cron = "0 0 6 * * ?")
public void insertTimeInvite() {
-
if (!Constant.IS_TASK) {
return;
}
@@ -317,7 +329,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);
@@ -348,18 +360,84 @@
}
}
+
/**
- * 鍔ㄦ�佸彂鍦�
- *
- * @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();
+ boolean addGoods = false;
+ Integer minId = 1;
+ while (minId != null) {
+ HDKGoodsListResultDTO dto = HaoDanKuApiUtil.getInstance().listHotGoods(minId, 100, 1, null);
+ if (dto != null) {
+ minId = dto.getMinId();
+ addGoods = addGoodsEvaluate(dto.getGoodsList());
+ } else {
+ minId = null;
+ }
+
+ if(addGoods) {
+ break;
+ }
+ }
+
+ // 澶ф窐瀹㈠鐢�
+ if (!addGoods) {
+ DaTaoKeGoodsResult result = DaTaoKeApiUtil.getRankingList(DaTaoKeApiUtil.RANK_TYPE_TIME, null);
+ if (result != null) {
+ List<DaTaoKeDetailV2> detailList = result.getGoodsList();
+ if (detailList != null && detailList.size() > 0) {
+ for (DaTaoKeDetailV2 daTaoKeV2: detailList) {
+ if(goodsEvaluateService.addByDaTaoKeGoods(daTaoKeV2))
+ break;
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ return ReturnT.SUCCESS;
+ }
+
+
+ private boolean addGoodsEvaluate(List<HDKGoodsDetail> hdkList) {
+ if (hdkList == null || hdkList.size() == 0) {
+ return false;
+ }
+ for (HDKGoodsDetail hdkGoods: hdkList) {
+ try {
+ Long itemid = hdkGoods.getItemid();
+ String itemdesc = hdkGoods.getItemdesc();
+ List<ActivityRuleUser> ruleList = activityUserService.listByRuleCode(ActivityRuleUser.RULE_HAOHUO, 1, 20);
+ ActivityUser user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();
+ goodsEvaluateService.addGoodsEvaluate(itemid + "", null, user, itemdesc, null, new Date());
+ return true;
+ } catch (GoodsEvaluateException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return false;
+ }
+
+
+
+ /**
+ * 姣忎竴涓皬鏃堕殢鏈哄湪鍒嗕韩鏁扮殑鍩虹涓婂姞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);
@@ -367,7 +445,5 @@
e1.printStackTrace();
}
}
- return ReturnT.SUCCESS;
}
-
}
--
Gitblit v1.8.0