From 6fdcc0c26dd33e87a024a69ed635d9aedb59cad6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 一月 2020 12:02:50 +0800
Subject: [PATCH] 订单搜索引擎增量更新
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 212 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 145 insertions(+), 67 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 2e82c83..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
@@ -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;
@@ -36,10 +37,11 @@
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;
+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;
@@ -48,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;
@@ -114,7 +117,7 @@
private TaoBaoShopService taoBaoShopService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@@ -127,6 +130,12 @@
@Resource
private IntegralGetCacheManager integralGetCacheManager;
+
+ @Resource
+ private BrandInfoService brandInfoService;
+
+ @Resource
+ private JDGoodsLinkParseManager jdGoodsLinkParseManager;
/**
* 绮樿创鏉夸俊鎭帹鑽�
@@ -144,9 +153,10 @@
}
// 鍘婚櫎鍓嶅悗绌烘牸
text = text.trim();
+ String originalText = text;
try {
- TokenVO tokenVO = tokenRecordService.discernToken(text, uid);
+ TokenVO tokenVO = tokenRecordService.discernToken(text, uid, acceptData);
out.print(JsonUtil.loadTrueResult(tokenVO));
return;
} catch (TokenRecordException e) {
@@ -182,7 +192,10 @@
if (analysisTaoToken(acceptData, text, out)) {
return;
}
-
+ if (!StringUtil.isNullOrEmpty(TaoBaoUtil.parseSystemTaoToken(text))) {
+ out.print(JsonUtil.loadFalseResult("涓嶆敮鎸佹帹鑽�"));
+ return;
+ }
JSONObject root = new JSONObject();
root.put("type", 2);
JSONObject data = new JSONObject();
@@ -219,7 +232,7 @@
tb = TaoBaoUtil.isAlimama(id);
if (tb == null) {
type = 4;
- tb = TaoBaoUtil.getTmallGoodsInfo(id);
+ tb = getTaoBaoGoodsBriefFromGoodsId(id, originalText);
}
} else if (text.contains("http://zmnxbc.com")) { // 鎵嬫満绔ぉ鐚獳PP鍒嗕韩
tb = TaoBaoUtil.parsePhoneShareUrlByTM(text);
@@ -231,20 +244,47 @@
tb = TaoBaoUtil.isAlimama(id);
if (tb == null) {
type = 4;
- tb = TaoBaoUtil.getTmallGoodsInfo(id);
+ tb = getTaoBaoGoodsBriefFromGoodsId(id, originalText);
}
} else if (text.contains("v.douyin.com")) { // 鎶栭煶
analysisDouYin(acceptData, text, out);
return;
} else {
tb = TaoBaoUtil.parsePhoneShareUrlByTB(text);
+
+ if (tb == null) {
+ String goodsId = TaoBaoUtil.getGoodsIdByPhoneShareUrl(text);
+ if (!StringUtil.isNullOrEmpty(goodsId)) {
+ tb = getTaoBaoGoodsBriefFromGoodsId(goodsId, originalText);
+ if (tb != null)
+ type = 4;
+ }
+ }
+
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 = jdGoodsLinkParseManager.parseGoodsIdByJDShortUrl(text);
+ }
+
if (!StringUtil.isNullOrEmpty(jdId)) {
JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(jdId));
if (goods != null) {
- commonGoods = CommonGoodsFactory.create(goods);
+ // 楂樼骇鎺ュ彛 -- 淇℃伅鏇村畬鏁�
+ JDGoods jdGoods = JDApiUtil.queryGoodsDetail(Long.parseLong(jdId));
+ if (jdGoods != null) {
+ commonGoods = CommonGoodsFactory.create(jdGoods);
+ } else {
+ commonGoods = CommonGoodsFactory.create(goods);
+ }
} else {
type = 4;
goods = JDUtil.getSimpleGoodsInfo(jdId);
@@ -263,7 +303,7 @@
} else {
type = 4;
goods = PinDuoDuoUtil.getPDDGoodsInfo(pddId);
- if(goods != null) {
+ if (goods != null) {
commonGoods = new CommonGoods();
commonGoods.setTitle(goods.getGoodsName());
commonGoods.setPicture(goods.getGoodsThumbnailUrl());
@@ -273,42 +313,42 @@
}
}
}
-
+
if (tb == null && commonGoods == null) {
out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
return;
}
-
+
if (type == 4) {
if (!VersionUtil.greaterThan_2_0_1(acceptData.getPlatform(), acceptData.getVersion())) {
out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
return;
- }
-
+ }
+
JSONObject data = new JSONObject();
if (tb != null) {
commonGoods = new CommonGoods();
commonGoods.setTitle(tb.getTitle());
commonGoods.setPicture(tb.getPictUrl());
}
-
- if (StringUtil.isNullOrEmpty(commonGoods.getTitle()) || StringUtil.isNullOrEmpty(commonGoods.getPicture())) {
+
+ if (StringUtil.isNullOrEmpty(commonGoods.getTitle())
+ || StringUtil.isNullOrEmpty(commonGoods.getPicture())) {
out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
return;
}
-
+
JSONObject goodsJSON = new JSONObject();
goodsJSON.put("title", commonGoods.getTitle());
goodsJSON.put("pictUrl", commonGoods.getPicture());
-
+
data.put("type", type);
data.put("desc", "璇ュ晢鍝佹棤鎺ㄥ箍淇℃伅");
data.put("goods", goodsJSON);
out.print(JsonUtil.loadTrueResult(data));
return;
- }
-
-
+ }
+
JSONObject data = new JSONObject();
if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
if (tb != null) {
@@ -324,14 +364,12 @@
}
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, null, fanLiRate, shareRate)));
+ data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,
+ hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion()))));
out.print(JsonUtil.loadTrueResult(data));
return;
}
@@ -366,9 +404,31 @@
root.put("data", data);
out.print(JsonUtil.loadTrueResult(root));
}
-
+
+ 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()));
+ // }
+ 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;
+ }
+
/**
* 瑙ｆ瀽鎶栭煶閾炬帴
+ *
* @param acceptData
* @param text
* @param out
@@ -388,7 +448,7 @@
JSONObject goodsJSON = new JSONObject();
goodsJSON.put("title", goods.getName());
goodsJSON.put("pictUrl", goods.getImg());
-
+
JSONObject data = new JSONObject();
data.put("type", 4);
data.put("desc", "璇ュ晢鍝佹棤鎺ㄥ箍淇℃伅");
@@ -401,10 +461,9 @@
return;
}
-
-
/**
* 瑙ｆ瀽娣樺彛浠�
+ *
* @param acceptData
* @param text
* @param out
@@ -430,25 +489,24 @@
} catch (TaobaoGoodsDownException e) {
e.printStackTrace();
}
-
+
if (goodsBrief == null) {
out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
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, null, fanLiRate, shareRate)));
+ data.put("goods",
+ gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief, hongBaoManageService
+ .getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion()))));
out.print(JsonUtil.loadTrueResult(data));
return true;
}
-
-
+
JSONObject data = new JSONObject();
JSONObject taoBaoGoodsJSON = new JSONObject();
taoBaoGoodsJSON.put("title", tb.getTitle());
@@ -486,7 +544,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()));
@@ -632,7 +690,8 @@
* @param endprice
* @return
*/
- private void searchTaoBaoGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, PrintWriter out) {
+ private void searchTaoBaoGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order,
+ PrintWriter out) {
SearchFilter sf = new SearchFilter();
sf.setKey(SearchFilterUtil.filterSearchContent(key));
sf.setPage(page);
@@ -674,9 +733,9 @@
}
// 鎼滅储澶ф窐瀹�
- List<DaTaoKeDetail> daTaoKeList = null;
+ List<DaTaoKeDetailV2> daTaoKeList = null;
if (page == 1) {
- daTaoKeList = daTaoKeGoodsDetailService.listByDtitle(key);
+ daTaoKeList = daTaoKeGoodsDetailV2Service.listByDtitle(key);
}
// 娣樺疂api鎼滅储鍟嗗搧
@@ -705,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) {
@@ -713,10 +772,11 @@
}
List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
+
for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {
- list.add(GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate));
+ list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));
}
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
@@ -727,24 +787,40 @@
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_0_5(platform, version))
+ || ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_2(platform, version))) {
+ 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 {
- data.put("shop", JsonUtil.getApiCommonGson().toJson(taoBaoShop));
+ } else {
+ 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))) {
+ 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));
}
@@ -759,7 +835,8 @@
* @param endprice
* @return
*/
- private void searchJDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, PrintWriter out) {
+ private void searchJDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order,
+ PrintWriter out) {
JDSearchResult result = null;
boolean hasCoupon = false;
@@ -901,12 +978,12 @@
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 = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
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));
@@ -934,7 +1011,8 @@
* @param endprice
* @return
*/
- private void searchPDDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, PrintWriter out) {
+ private void searchPDDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order,
+ PrintWriter out) {
PDDSearchFilter pddfilter = new PDDSearchFilter();
pddfilter.setKw(SearchFilterUtil.filterSearchContent(key));
pddfilter.setPage(page);
@@ -984,11 +1062,11 @@
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 = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
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