From c9cbdfa41d645d42eeaa7e06d550d4ef8ac328e7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 03 一月 2020 12:15:08 +0800
Subject: [PATCH] redis关键词
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 97 +++++++++++++++++++++++++++---------------------
1 files changed, 55 insertions(+), 42 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 77d1fa6..881f331 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
@@ -37,7 +37,7 @@
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.user.TokenRecordException;
import com.yeshi.fanli.log.LogHelper;
@@ -50,10 +50,11 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.service.inter.user.HistorySearchService;
import com.yeshi.fanli.service.inter.user.TokenRecordService;
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
+import com.yeshi.fanli.service.manger.goods.jd.JDGoodsLinkParseManager;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.DouYinUtil;
@@ -116,7 +117,7 @@
private TaoBaoShopService taoBaoShopService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@@ -129,11 +130,12 @@
@Resource
private IntegralGetCacheManager integralGetCacheManager;
-
-
+
@Resource
private BrandInfoService brandInfoService;
-
+
+ @Resource
+ private JDGoodsLinkParseManager jdGoodsLinkParseManager;
/**
* 绮樿创鏉夸俊鎭帹鑽�
@@ -151,6 +153,7 @@
}
// 鍘婚櫎鍓嶅悗绌烘牸
text = text.trim();
+ String originalText = text;
try {
TokenVO tokenVO = tokenRecordService.discernToken(text, uid, acceptData);
@@ -229,7 +232,7 @@
tb = TaoBaoUtil.isAlimama(id);
if (tb == null) {
type = 4;
- tb = getTaoBaoGoodsBriefFromGoodsId(id);
+ tb = getTaoBaoGoodsBriefFromGoodsId(id, originalText);
}
} else if (text.contains("http://zmnxbc.com")) { // 鎵嬫満绔ぉ鐚獳PP鍒嗕韩
tb = TaoBaoUtil.parsePhoneShareUrlByTM(text);
@@ -241,7 +244,7 @@
tb = TaoBaoUtil.isAlimama(id);
if (tb == null) {
type = 4;
- tb = getTaoBaoGoodsBriefFromGoodsId(id);
+ tb = getTaoBaoGoodsBriefFromGoodsId(id, originalText);
}
} else if (text.contains("v.douyin.com")) { // 鎶栭煶
analysisDouYin(acceptData, text, out);
@@ -252,7 +255,7 @@
if (tb == null) {
String goodsId = TaoBaoUtil.getGoodsIdByPhoneShareUrl(text);
if (!StringUtil.isNullOrEmpty(goodsId)) {
- tb = getTaoBaoGoodsBriefFromGoodsId(goodsId);
+ tb = getTaoBaoGoodsBriefFromGoodsId(goodsId, originalText);
if (tb != null)
type = 4;
}
@@ -261,17 +264,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);
+ jdId = jdGoodsLinkParseManager.parseGoodsIdByJDShortUrl(text);
}
-
+
if (!StringUtil.isNullOrEmpty(jdId)) {
JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(jdId));
if (goods != null) {
@@ -362,13 +365,11 @@
commonGoods = CommonGoodsFactory.create(goodsBrief);
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
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,hongBaoManageService.getVIPFanLiRate()))));
+ hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion()))));
out.print(JsonUtil.loadTrueResult(data));
return;
}
@@ -404,12 +405,22 @@
out.print(JsonUtil.loadTrueResult(root));
}
- private TaoBaoGoodsBrief getTaoBaoGoodsBriefFromGoodsId(String goodsId) {
+ private TaoBaoGoodsBrief getTaoBaoGoodsBriefFromGoodsId(String goodsId, String text) {
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()));
+ // tb = TaoBaoUtil.getSimpleGoodsBrief(Long.parseLong(goodsId));
+ // if (tb != null) {
+ // tb.setPictUrl(TbImgUtil.getTBSize220Img(tb.getPictUrl()));
+ // }
+ if (tb == null) {
+ tb = new TaoBaoGoodsBrief();
+ if (text.trim().indexOf("銆�") == 0 && text.trim().indexOf("銆�") > 0) {
+ // 鎴彇鏍囬
+ String title = text.trim().substring(1, text.trim().lastIndexOf("銆�"));
+ tb.setAuctionId(Long.parseLong(goodsId));
+ tb.setTitle(title);
+ tb.setPictUrl("http://");
+ }
}
}
return tb;
@@ -484,15 +495,14 @@
return false;
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
JSONObject data = new JSONObject();
data.put("type", 3);
- data.put("goods", gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief,
- new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate()))));
+ data.put("goods",
+ gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief, hongBaoManageService
+ .getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion()))));
out.print(JsonUtil.loadTrueResult(data));
return true;
}
@@ -723,9 +733,9 @@
}
// 鎼滅储澶ф窐瀹�
- List<DaTaoKeDetail> daTaoKeList = null;
+ List<DaTaoKeDetailV2> daTaoKeList = null;
if (page == 1) {
- daTaoKeList = daTaoKeGoodsDetailService.listByDtitle(key);
+ daTaoKeList = daTaoKeGoodsDetailV2Service.listByDtitle(key);
}
// 娣樺疂api鎼滅储鍟嗗搧
@@ -754,7 +764,7 @@
if (daTaoKeList != null && daTaoKeList.size() > 0) {
try {
Collections.reverse(daTaoKeList);
- for (DaTaoKeDetail detail : daTaoKeList) {
+ for (DaTaoKeDetailV2 detail : daTaoKeList) {
taoBaoGoodsBriefs.add(0, TaoBaoUtil.convert(detail));
}
} catch (Exception e) {
@@ -762,9 +772,8 @@
}
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());
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {
list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));
@@ -780,18 +789,25 @@
if (page == 1) { // 绗竴椤佃繑鍥炲簵閾轰俊鎭�
String platform = acceptData.getPlatform();
String version = acceptData.getVersion();
- if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_1(platform, version))
+ if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_5(platform, version))
|| ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_2(platform, version))) {
- BrandInfoVO brandInfoVO = brandInfoService.listByAlikeName(key);
+ BrandInfoVO brandInfoVO = null;
+ try {
+ brandInfoVO = brandInfoService.listByAlikeName(key, acceptData.getPlatform(),
+ acceptData.getVersion());
+ } catch (Exception e) {
+ }
if (brandInfoVO != null)
data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO));
} else {
- List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key);
+ List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key, acceptData.getPlatform(),
+ acceptData.getVersion());
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))) {
+ || ("android".equalsIgnoreCase(platform)
+ && VersionUtil.greaterThan_2_0_1(platform, version))) {
BrandInfoVO brandInfoVO = new BrandInfoVO();
brandInfoVO.setId(taoBaoShop.getId());
brandInfoVO.setName(taoBaoShop.getShopName());
@@ -804,7 +820,7 @@
}
}
}
-
+
out.print(JsonUtil.loadTrueResult(data));
}
@@ -962,12 +978,10 @@
List<JDGoods> goodsList = result.getGoodsList();
if (goodsList != null && goodsList.size() > 0) {
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- 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());
-
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
for (JDGoods goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
if (hasCoupon) {
@@ -1048,9 +1062,8 @@
Gson gson = JsonUtil.getApiCommonGson();
List<PDDGoodsDetail> goodsList = result.getGoodsList();
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());
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
for (PDDGoodsDetail goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);
--
Gitblit v1.8.0