From bf0a347104579e5f7a2ed6e660ebb9f17f76ffc0 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期五, 17 一月 2020 16:51:54 +0800 Subject: [PATCH] 后台编辑 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 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 be91b5d..9d5f2a8 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 @@ -34,10 +34,11 @@ import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.goods.CommonGoods; import com.yeshi.fanli.entity.jd.JDGoods; +import com.yeshi.fanli.entity.system.ConfigKeyEnum; 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,7 +51,7 @@ 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; @@ -117,7 +118,7 @@ private TaoBaoShopService taoBaoShopService; @Resource - private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService; + private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service; @Resource(name = "taskExecutor") private TaskExecutor executor; @@ -153,7 +154,7 @@ } // 鍘婚櫎鍓嶅悗绌烘牸 text = text.trim(); - String originalText=text; + String originalText = text; try { TokenVO tokenVO = tokenRecordService.discernToken(text, uid, acceptData); @@ -232,7 +233,7 @@ tb = TaoBaoUtil.isAlimama(id); if (tb == null) { type = 4; - tb = getTaoBaoGoodsBriefFromGoodsId(id,originalText); + tb = getTaoBaoGoodsBriefFromGoodsId(id, originalText); } } else if (text.contains("http://zmnxbc.com")) { // 鎵嬫満绔ぉ鐚獳PP鍒嗕韩 tb = TaoBaoUtil.parsePhoneShareUrlByTM(text); @@ -244,7 +245,7 @@ tb = TaoBaoUtil.isAlimama(id); if (tb == null) { type = 4; - tb = getTaoBaoGoodsBriefFromGoodsId(id,originalText); + tb = getTaoBaoGoodsBriefFromGoodsId(id, originalText); } } else if (text.contains("v.douyin.com")) { // 鎶栭煶 analysisDouYin(acceptData, text, out); @@ -255,7 +256,7 @@ if (tb == null) { String goodsId = TaoBaoUtil.getGoodsIdByPhoneShareUrl(text); if (!StringUtil.isNullOrEmpty(goodsId)) { - tb = getTaoBaoGoodsBriefFromGoodsId(goodsId,originalText); + tb = getTaoBaoGoodsBriefFromGoodsId(goodsId, originalText); if (tb != null) type = 4; } @@ -408,10 +409,10 @@ 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) { @@ -733,9 +734,9 @@ } // 鎼滅储澶ф窐瀹� - List<DaTaoKeDetail> daTaoKeList = null; + List<DaTaoKeDetailV2> daTaoKeList = null; if (page == 1) { - daTaoKeList = daTaoKeGoodsDetailService.listByDtitle(key); + daTaoKeList = daTaoKeGoodsDetailV2Service.listByDtitle(key); } // 娣樺疂api鎼滅储鍟嗗搧 @@ -764,7 +765,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) { @@ -789,7 +790,7 @@ 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 = null; try { @@ -840,7 +841,7 @@ JDSearchResult result = null; boolean hasCoupon = false; - String way = configService.get("jd_api_search_key"); + String way = configService.get(ConfigKeyEnum.jdApiSearchKey.getKey()); if ("1".equals(way)) { JDFilter filterAPI = new JDFilter(); filterAPI.setKeyword(SearchFilterUtil.filterSearchContent(key)); -- Gitblit v1.8.0