From eda5d0e998204c7a49ab84d8528569b765bec2f9 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 20 十二月 2019 10:05:10 +0800
Subject: [PATCH] 品牌日志
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 103 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 77 insertions(+), 26 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 36f71ea..e1c4b4b 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
@@ -23,6 +23,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.douyin.DouYinGoods;
import com.yeshi.fanli.dto.jd.JDFilter;
import com.yeshi.fanli.dto.jd.JDSearchFilter;
@@ -40,6 +41,7 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.user.TokenRecordException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.brand.BrandInfoService;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SuperHotSearchService;
@@ -128,6 +130,9 @@
@Resource
private IntegralGetCacheManager integralGetCacheManager;
+ @Resource
+ private BrandInfoService brandInfoService;
+
/**
* 绮樿创鏉夸俊鎭帹鑽�
*
@@ -146,7 +151,7 @@
text = text.trim();
try {
- TokenVO tokenVO = tokenRecordService.discernToken(text, uid);
+ TokenVO tokenVO = tokenRecordService.discernToken(text, uid, acceptData);
out.print(JsonUtil.loadTrueResult(tokenVO));
return;
} catch (TokenRecordException e) {
@@ -222,7 +227,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);
@@ -234,7 +239,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);
@@ -245,7 +250,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;
}
@@ -254,6 +259,17 @@
if (tb == null)// 娣樺疂鏄┖鍊�
{
String jdId = JDUtil.getJDGoodsId(text);
+
+ // 寰俊閾炬帴
+ if (StringUtil.isNullOrEmpty(jdId)) {
+ jdId = JDUtil.getJDGoodsIdByWeiXin(text);
+ }
+
+ // 棰嗗埜鐭繛鎺�
+ if (StringUtil.isNullOrEmpty(jdId) && text.contains("u.jd.com")) {
+ jdId = JDUtil.getJDGoodsIdByUJD(text);
+ }
+
if (!StringUtil.isNullOrEmpty(jdId)) {
JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(jdId));
if (goods != null) {
@@ -350,7 +366,8 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
data.put("type", type);
data.put("goods",
- gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate)));
+ gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, new ConfigParamsDTO(fanLiRate,
+ shareRate, Constant.MAX_REWARD_RATE, hongBaoManageService.getVIPFanLiRate()))));
out.print(JsonUtil.loadTrueResult(data));
return;
}
@@ -384,6 +401,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;
}
/**
@@ -462,8 +490,10 @@
JSONObject data = new JSONObject();
data.put("type", 3);
- data.put("goods", gson
- .toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief, null, fanLiRate, shareRate)));
+ data.put("goods",
+ gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief,
+ new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
+ hongBaoManageService.getVIPFanLiRate()))));
out.print(JsonUtil.loadTrueResult(data));
return true;
}
@@ -505,7 +535,7 @@
@RequestMapping(value = "tokenReceive", method = RequestMethod.POST)
public void tokenReceive(AcceptData acceptData, Long uid, String token, PrintWriter out) {
try {
- String msg = tokenRecordService.receiveToken(token, uid);
+ String msg = tokenRecordService.receiveToken(token, uid, acceptData);
out.print(JsonUtil.loadTrueResult(msg));
} catch (TokenRecordException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
@@ -735,8 +765,11 @@
List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
+ hongBaoManageService.getVIPFanLiRate());
+
for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {
- list.add(GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate));
+ list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));
}
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
@@ -747,25 +780,38 @@
data.put("count", result.getTaoBaoHead().getDocsfound());
if (page == 1) { // 绗竴椤佃繑鍥炲簵閾轰俊鎭�
- List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key);
- if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoodsVO() != null
- && listShop.get(0).getListGoodsVO().size() > 2) {
- String platform = acceptData.getPlatform();
- TaoBaoShopVO taoBaoShop = listShop.get(0);
- if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0(platform, acceptData.getVersion()))
- || ("android".equalsIgnoreCase(platform)
- && VersionUtil.greaterThan_2_0_1(platform, acceptData.getVersion()))) {
- BrandInfoVO brandInfoVO = new BrandInfoVO();
- brandInfoVO.setId(taoBaoShop.getId());
- brandInfoVO.setName(taoBaoShop.getShopName());
- brandInfoVO.setIcon(taoBaoShop.getShopIcon());
- brandInfoVO.setListGoods(taoBaoShop.getListGoodsVO());
+ String platform = acceptData.getPlatform();
+ String version = acceptData.getVersion();
+ if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_1(platform, version))
+ || ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_2(platform, version))) {
+ BrandInfoVO brandInfoVO = null;
+ try {
+ brandInfoVO = brandInfoService.listByAlikeName(key);
+ } catch (Exception e) {
+ }
+ if (brandInfoVO != null)
data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO));
- } else {
- data.put("shop", JsonUtil.getApiCommonGson().toJson(taoBaoShop));
+ } else {
+ List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key);
+ if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoodsVO() != null
+ && listShop.get(0).getListGoodsVO().size() > 2) {
+ TaoBaoShopVO taoBaoShop = listShop.get(0);
+ if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0(platform, version))
+ || ("android".equalsIgnoreCase(platform)
+ && VersionUtil.greaterThan_2_0_1(platform, version))) {
+ BrandInfoVO brandInfoVO = new BrandInfoVO();
+ brandInfoVO.setId(taoBaoShop.getId());
+ brandInfoVO.setName(taoBaoShop.getShopName());
+ brandInfoVO.setIcon(taoBaoShop.getShopIcon());
+ brandInfoVO.setListGoods(taoBaoShop.getListGoodsVO());
+ data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO));
+ } else {
+ data.put("shop", JsonUtil.getApiCommonGson().toJson(taoBaoShop));
+ }
}
}
}
+
out.print(JsonUtil.loadTrueResult(data));
}
@@ -927,8 +973,11 @@
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,
+ hongBaoManageService.getVIPFanLiRate());
+
for (JDGoods goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
if (hasCoupon) {
if (goodsDetailVO.isHasCoupon()) {
array.add(gson.toJson(goodsDetailVO));
@@ -1009,9 +1058,11 @@
if (goodsList != null && goodsList.size() > 0) {
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
+ hongBaoManageService.getVIPFanLiRate());
for (PDDGoodsDetail goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);
array.add(gson.toJson(goodsDetailVO));
}
}
--
Gitblit v1.8.0