From eb58d2d4fcc201dbfb31e96c58e680b7da0a846e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 23 六月 2020 11:45:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 585a424..c17a307 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
@@ -28,7 +28,6 @@
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.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.entity.taobao.haodanku.HDKGoodsDetail;
import com.yeshi.fanli.exception.dynamic.GoodsEvaluateException;
@@ -438,9 +437,11 @@
List<ActivityRuleUser> ruleList = activityUserService.listByRuleCode(ActivityRuleUser.RULE_HAOHUO, 1, 20);
ActivityUser user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();
- goodsEvaluateService.addGoodsEvaluate2(TaoBaoGoodsFactory.create(hdkGoods), 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) {
@@ -490,9 +491,11 @@
user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();
}
- goodsEvaluateService.addGoodsEvaluate2(TaoBaoUtil.convert(tkGoods), 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) {
@@ -505,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