From b416c2ffd263ca9d191fc1109bd72d10f8c5176d Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期三, 04 三月 2020 14:19:11 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 61 +++++++++++++++++++++---------
1 files changed, 42 insertions(+), 19 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 6b89a94..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
@@ -33,7 +33,6 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.dynamic.CommentInfo;
-import com.yeshi.fanli.entity.dynamic.CommentInfo.CommentInfoEnum;
import com.yeshi.fanli.entity.dynamic.DynamicInfo;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate.EvaluateEnum;
@@ -41,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;
@@ -67,10 +67,12 @@
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;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
/**
@@ -123,7 +125,7 @@
@Resource
private QrCodeService qrCodeService;
-
+
@Resource
private ConvertLinkManager convertLinkManager;
@@ -240,7 +242,7 @@
// 2.0.7杩斿洖鍙戝湀+娲诲姩+瀛﹂櫌+绱犳潗
list.add(map.get(TYPE_FAQUAN));
list.add(map.get(TYPE_HUODONG));
- // list.add(map.get(TYPE_XUEYUAN));
+// list.add(map.get(TYPE_XUEYUAN));
list.add(map.get(TYPE_SUCAI));
} else if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
@@ -590,6 +592,7 @@
*/
@RequestMapping(value = "getDynamicList", method = RequestMethod.POST)
public void getDynamicListNew(AcceptData acceptData, Integer page, Long cid, String subId, PrintWriter out) {
+
try {
int type = 1;
if (cid == TYPE_FAQUAN){
@@ -669,12 +672,33 @@
});
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++) {
+ Object object = array.get(i);
+ JSONObject json = JSONObject.fromObject(object);
+ Object shareNum = json.get("shareNum");
+ if (shareNum != null) {
+ int num = Integer.parseInt(shareNum.toString());
+ if (num >= 10000) {
+ double sales = num;
+ String salesCountMidea = String.format("%.1f", sales / 10000);
+ json.put("shareNum", salesCountMidea + "涓�");
+ }
+ }
+ jsonArray.add(json);
+ }
+
+
JSONObject data = new JSONObject();
data.put("count", count);
- data.put("list", gson.toJson(list));
+ data.put("list", jsonArray);
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
+ e.printStackTrace();
out.print(JsonUtil.loadFalseResult(1, "鏌ヨ淇℃伅澶辫触"));
LogHelper.errorDetailInfo(e);
}
@@ -773,7 +797,7 @@
continue;
}
- String jumpLink = getJumpLink(goodsVO, user,relationId, inviteCode);
+ String jumpLink = getJumpLink(goodsVO, user, relationId, inviteCode);
if (!StringUtil.isNullOrEmpty(jumpLink)) {
list.add(jumpLink);
}
@@ -785,7 +809,7 @@
if (imgInfo.getGoodsVO() != null)
if (imgInfo.getGoodsVO().getGoodsId().longValue() == goodsId.longValue()
&& imgInfo.getGoodsVO().getGoodsType() == goodsType.intValue()) {
- String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user,relationId, inviteCode);
+ String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, relationId, inviteCode);
if (!StringUtil.isNullOrEmpty(jumpLink)) {
list.add(jumpLink);
}
@@ -795,7 +819,7 @@
} else if (type == 2 || type == 3) {
for (ImgInfo imgInfo : imgs) {
if (imgInfo.getGoodsVO() != null) {
- String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user,relationId, inviteCode);
+ String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, relationId, inviteCode);
if (!StringUtil.isNullOrEmpty(jumpLink)) {
list.add(jumpLink);
}
@@ -816,7 +840,6 @@
}
}
}
-
Integer shareCount = goodsEvaluate.getShareNum();
if (shareCount == null) {
@@ -838,21 +861,21 @@
data.put("list", list);
out.print(JsonUtil.loadTrueResult(data));
}
-
+
@Resource
private ShareGoodsService shareGoodsService;
- private String getJumpLink(GoodsDetailVO goodsVO, UserInfo user,String relationId, String inviteCode) {
+ private String getJumpLink(GoodsDetailVO goodsVO, UserInfo user, String relationId, String inviteCode) {
String jumpLink = null;
if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
- TaoBaoLink taoBaoLink=null;
+ TaoBaoLink taoBaoLink = null;
try {
taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(user.getId(), goodsVO.getGoodsId(), relationId);
} 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) {
@@ -880,6 +903,7 @@
return null;
}
+
/**
* 璇勮澶嶅埗
*
@@ -933,12 +957,12 @@
}
}
}
-
+
try {
- text=convertLinkManager.convertLinkFromText(text, uid, true);
+ text = convertLinkManager.convertLinkFromText(text, uid, true);
} catch (Exception e) {
e.printStackTrace();
- out.print(JsonUtil.loadFalseResult("杞摼澶辫触"));
+ out.print(JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
return;
}
@@ -946,6 +970,5 @@
data.put("text", text);
out.print(JsonUtil.loadTrueResult(data));
}
-
-}
+}
--
Gitblit v1.8.0