From dcb37a9df7c41be08d3aed13667e9162382d134a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 19 六月 2020 10:47:53 +0800
Subject: [PATCH] 发圈商品来源调整
---
fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 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 d22601e..585a424 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
@@ -28,6 +28,7 @@
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;
@@ -45,9 +46,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 {
@@ -419,25 +422,23 @@
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();
- HDKGoodsDetail itemDetail = HaoDanKuApiUtil.getInstance().getItemDetail(itemid);
- if (itemDetail == null) {
- continue;
- }
-
-
-
- goodsEvaluateService.addGoodsEvaluate2(itemid, pics, user, showtitle, null);
+ goodsEvaluateService.addGoodsEvaluate2(TaoBaoGoodsFactory.create(hdkGoods), pics, user, showtitle, null);
addResult = true;
break;
} catch (GoodsEvaluateException e) {
@@ -463,26 +464,33 @@
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(" ", " ");
+ 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);
+
+ goodsEvaluateService.addGoodsEvaluate2(TaoBaoUtil.convert(tkGoods), null, user, showtitle, null);
addResult = true;
break;
} catch (GoodsEvaluateException e) {
--
Gitblit v1.8.0