From ec60e757d358636dcac1589c44a66f3e276fe58c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 14:41:42 +0800
Subject: [PATCH] 拉新

---
 fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java |   53 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 17 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 1b8c79f..c17a307 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
@@ -29,6 +29,7 @@
 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;
@@ -44,9 +45,11 @@
 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.factory.goods.TaoBaoGoodsFactory;
 import com.yeshi.fanli.util.jd.JDApiUtil;
 import com.yeshi.fanli.util.jd.JDUtil;
 import com.yeshi.fanli.util.taobao.HaoDanKuApiUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 
 @Component
 public class DynamicInfoJob {
@@ -418,20 +421,27 @@
 					continue;
 				}
 				
-				for (HDKWXCircleContentDTO hdkGoods: list) {
+				for (HDKWXCircleContentDTO circleContentDTO: list) {
 					try {
-						String itemid = hdkGoods.getItemid();
-						List<String> pics = hdkGoods.getItempic();
-						String copy_content = hdkGoods.getCopy_content();
+						String itemid = circleContentDTO.getItemid();
+						HDKGoodsDetail hdkGoods = HaoDanKuApiUtil.getInstance().getItemDetail(itemid);
+						if (hdkGoods == null) {
+							continue;
+						}
 						
+						List<String> pics = circleContentDTO.getItempic();
+						String copy_content = circleContentDTO.getCopy_content();
 						String showtitle = StringEscapeUtils.unescapeHtml(copy_content);
 						showtitle = showtitle.replace("<br>", "\r\n");
 						
 						List<ActivityRuleUser> ruleList = activityUserService.listByRuleCode(ActivityRuleUser.RULE_HAOHUO, 1, 20);
 						ActivityUser user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();
-						goodsEvaluateService.addGoodsEvaluate2(itemid, pics, user, showtitle, null);
-						addResult = true;
-						break;
+						
+						int addProcess = goodsEvaluateService.addGoodsEvaluate(TaoBaoGoodsFactory.create(hdkGoods), pics, user, showtitle);
+						if (addProcess == 0) {
+							addResult = true;
+							break;
+						}
 					} catch (GoodsEvaluateException e) {
 						e.printStackTrace();
 					} catch (Exception e) {
@@ -455,28 +465,37 @@
 		try {
 			DaTaoKeGoodsResult result = DaTaoKeApiUtil.getFriendsFircleList("1", 100);
 			while (result.getGoodsList() != null && result.getGoodsList().size() > 0) {
-				for (DaTaoKeDetailV2 v2 : result.getGoodsList()) {
+				for (DaTaoKeDetailV2 detailV2 : result.getGoodsList()) {
 					try {
-						Long goodsId = v2.getGoodsId();
-						String circleText = v2.getCircleText();
+						Long goodsId = detailV2.getGoodsId();
+						
+						String circleText = detailV2.getCircleText();
 						if (circleText == null) {
 							continue;
 						}
 						String showtitle = URLDecoder.decode(circleText, "UTF-8");
 						showtitle = showtitle.replace("&nbsp;", " ");
 
+						DaTaoKeDetailV2 tkGoods = DaTaoKeApiUtil.getGoodsDetailByGoodsId(goodsId);
+						if(tkGoods == null) {
+							continue;
+						}
+						
 						ActivityUser user = null;
-						if (v2.getCid() != null) {
-							user = activityUserService.getRandomByDaTaoKeCid(v2.getCid());
+						if (detailV2.getCid() != null) {
+							user = activityUserService.getRandomByDaTaoKeCid(detailV2.getCid());
 						}
 						if (user == null) {
 							List<ActivityRuleUser> ruleList = activityUserService
 									.listByRuleCode(ActivityRuleUser.RULE_HAOHUO, 1, 20);
 							user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();
 						}
-						goodsEvaluateService.addGoodsEvaluate2(goodsId + "", null, user, showtitle, null);
-						addResult = true;
-						break;
+						
+						int addProcess = goodsEvaluateService.addGoodsEvaluate(TaoBaoUtil.convert(tkGoods), null, user, showtitle);
+						if (addProcess == 0) {
+							addResult = true;
+							break;
+						}
 					} catch (GoodsEvaluateException e) {
 						e.printStackTrace();
 					} catch (Exception e) {
@@ -489,9 +508,9 @@
 				}
 
 				try {
-					result = DaTaoKeApiUtil.listAll(result.getPageId());
+					result = DaTaoKeApiUtil.getFriendsFircleList(result.getPageId(), 100);
 				} catch (Exception e) {
-					result = DaTaoKeApiUtil.listAll(result.getPageId());
+					result = DaTaoKeApiUtil.getFriendsFircleList(result.getPageId(), 100);
 				}
 				try {
 					Thread.sleep(10);

--
Gitblit v1.8.0