From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index 9246634..1e4a2cd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -223,7 +223,7 @@
tb = TaoBaoUtil.isAlimama(id);
if (tb == null) {
type = 4;
- tb = TaoBaoUtil.getTmallGoodsInfo(id);
+ tb = getTaoBaoGoodsBriefFromGoodsId(id);
}
} else if (text.contains("http://zmnxbc.com")) { // 鎵嬫満绔ぉ鐚獳PP鍒嗕韩
tb = TaoBaoUtil.parsePhoneShareUrlByTM(text);
@@ -235,7 +235,7 @@
tb = TaoBaoUtil.isAlimama(id);
if (tb == null) {
type = 4;
- tb = TaoBaoUtil.getTmallGoodsInfo(id);
+ tb = getTaoBaoGoodsBriefFromGoodsId(id);
}
} else if (text.contains("v.douyin.com")) { // 鎶栭煶
analysisDouYin(acceptData, text, out);
@@ -246,7 +246,7 @@
if (tb == null) {
String goodsId = TaoBaoUtil.getGoodsIdByPhoneShareUrl(text);
if (!StringUtil.isNullOrEmpty(goodsId)) {
- tb = TaoBaoUtil.getTmallGoodsInfo(goodsId);
+ tb = getTaoBaoGoodsBriefFromGoodsId(goodsId);
if (tb != null)
type = 4;
}
@@ -350,8 +350,8 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
data.put("type", type);
- data.put("goods",
- gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE))));
+ data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,
+ new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE))));
out.print(JsonUtil.loadTrueResult(data));
return;
}
@@ -385,6 +385,17 @@
root.put("type", 1);
root.put("data", data);
out.print(JsonUtil.loadTrueResult(root));
+ }
+
+ private TaoBaoGoodsBrief getTaoBaoGoodsBriefFromGoodsId(String goodsId) {
+ TaoBaoGoodsBrief tb = TaoBaoUtil.getTmallGoodsInfo(goodsId);
+ if (tb == null && NumberUtil.isNumeric(goodsId)) {// 鏄暟瀛�
+ tb = TaoBaoUtil.getSimpleGoodsBrief(Long.parseLong(goodsId));
+ if (tb != null) {
+ tb.setPictUrl(TbImgUtil.getTBSize220Img(tb.getPictUrl()));
+ }
+ }
+ return tb;
}
/**
@@ -463,8 +474,8 @@
JSONObject data = new JSONObject();
data.put("type", 3);
- data.put("goods", gson
- .toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief, new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE))));
+ data.put("goods", gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief,
+ new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE))));
out.print(JsonUtil.loadTrueResult(data));
return true;
}
@@ -736,7 +747,7 @@
List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {
list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));
@@ -930,7 +941,7 @@
BigDecimal shareRate = hongBaoManageService.getShareRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
for (JDGoods goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
@@ -1014,7 +1025,7 @@
if (goodsList != null && goodsList.size() > 0) {
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
for (PDDGoodsDetail goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);
--
Gitblit v1.8.0