From 797434495f603192642e0fdecbd947876129c7fd Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期三, 04 三月 2020 14:17:55 +0800
Subject: [PATCH] 动态
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index 0592d5a..50f0893 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -40,6 +40,7 @@
import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.exception.share.ShareGoodsException;
import com.yeshi.fanli.log.LogHelper;
@@ -66,6 +67,7 @@
import com.yeshi.fanli.util.jd.JDUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.dynamic.ArticleVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
@@ -671,6 +673,8 @@
Gson gson = gsonBuilder.create();
long count = goodsEvaluateService.countValidMaterials(type);
+ JSONArray jsonArray = new JSONArray();
+
String listStr = gson.toJson(list);
JSONArray array = JSONArray.fromObject(listStr);
for (int i = 0; i< array.size() ; i++) {
@@ -685,13 +689,13 @@
json.put("shareNum", salesCountMidea + "涓�");
}
}
-// array.add(json);
+ jsonArray.add(json);
}
JSONObject data = new JSONObject();
data.put("count", count);
- data.put("list", array);
+ data.put("list", jsonArray);
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
e.printStackTrace();
@@ -870,9 +874,8 @@
} catch (ShareGoodsException e) {
e.printStackTrace();
}
-
- jumpLink = configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()).replace("[娣樺彛浠",
- taoBaoLink.getTaoToken());
+ jumpLink = ShareControllerV2.getERCodeContentNew(configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()),
+ taoBaoLink.getGoods(), TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
} else if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_JD) {
JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsVO.getGoodsId());
if (jdGoods == null) {
@@ -900,6 +903,7 @@
return null;
}
+
/**
* 璇勮澶嶅埗
*
--
Gitblit v1.8.0