From 36ba03c443aa7927e64a88408b2240cf3b56d16d Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期四, 05 三月 2020 23:08:59 +0800
Subject: [PATCH] 分享数兼容亿的情况
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 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 8c1f598..3255708 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
@@ -128,11 +128,9 @@
@Resource
private ConvertLinkManager convertLinkManager;
-
+
@Resource
private ShareGoodsService shareGoodsService;
-
-
private final static long TYPE_REXIAO = 1;// 鐑攢
private final static long TYPE_TUIJIAN = 2;// 鎺ㄨ崘
@@ -247,7 +245,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())) {
@@ -600,7 +598,7 @@
try {
int type = 1;
- if (cid == TYPE_FAQUAN){
+ if (cid == TYPE_FAQUAN) {
type = 1;
} else if (cid == TYPE_SUCAI) {
type = 2;
@@ -611,7 +609,7 @@
if (list == null) {
list = new ArrayList<>();
}
-
+
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
gsonBuilder.registerTypeAdapter(ImgEnum.class, new JsonSerializer<ImgEnum>() {
@Override
@@ -677,27 +675,31 @@
});
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++) {
+ 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) {
+
+ if (num >= 100000000) {
+ double sales = num;
+ String salesCountMidea = String.format("%.1f", sales / 100000000);
+ json.put("shareNum", salesCountMidea + "浜�");
+ } else 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", jsonArray);
@@ -707,7 +709,7 @@
out.print(JsonUtil.loadFalseResult(1, "鏌ヨ淇℃伅澶辫触"));
LogHelper.errorDetailInfo(e);
}
-
+
}
/**
@@ -797,12 +799,13 @@
// 鍗曞搧
if (goodsEvaluate.getType() == EvaluateEnum.single) {
for (ImgInfo imgInfo : imgs) {
- if ( type == 3 && imgInfo.getType() == ImgEnum.video)
+ if (type == 3 && imgInfo.getType() == ImgEnum.video)
continue;
-
+
GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
if (goodsVO == null) {
- list.add(StringUtil.isNullOrEmpty(imgInfo.getUrlHD()) ? imgInfo.getUrl() : imgInfo.getUrlHD());
+ list.add(StringUtil.isNullOrEmpty(imgInfo.getUrlHD()) ? imgInfo.getUrl()
+ : imgInfo.getUrlHD());
continue;
}
@@ -841,7 +844,8 @@
if (imgInfo.getType() == ImgEnum.goods || imgInfo.getType() == ImgEnum.video)
continue;
if (imgInfo.getType() == ImgEnum.img)
- list.add(StringUtil.isNullOrEmpty(imgInfo.getUrlHD()) ? imgInfo.getUrl() : imgInfo.getUrlHD());
+ list.add(StringUtil.isNullOrEmpty(imgInfo.getUrlHD()) ? imgInfo.getUrl()
+ : imgInfo.getUrlHD());
else if (imgInfo.getType() == ImgEnum.activity)
if (!StringUtil.isNullOrEmpty(imgInfo.getActivityPic())) {
list.add(imgInfo.getActivityPic());
@@ -875,7 +879,6 @@
}
}
-
private String getJumpLink(GoodsDetailVO goodsVO, UserInfo user, String relationId, String inviteCode) {
String jumpLink = null;
if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
@@ -885,8 +888,9 @@
} catch (ShareGoodsException e) {
e.printStackTrace();
}
- jumpLink = ShareControllerV2.getERCodeContentNew(configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()),
- taoBaoLink.getGoods(), TaoBaoUtil.filterTaoToken(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) {
@@ -914,7 +918,6 @@
return null;
}
-
/**
* 璇勮澶嶅埗
*
--
Gitblit v1.8.0