From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 644 +++++++++++++++++++++++-----------------------------------
1 files changed, 253 insertions(+), 391 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 1e4a2cd..1bc82f3 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
@@ -5,9 +5,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import javax.annotation.Resource;
import javax.servlet.http.HttpSession;
@@ -16,15 +13,11 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
-import org.yeshi.utils.taobao.TbImgUtil;
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;
import com.yeshi.fanli.dto.jd.JDSearchResult;
@@ -34,31 +27,35 @@
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;
+import com.yeshi.fanli.service.inter.brand.BrandInfoService;
+import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SuperHotSearchService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
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.ClipboardAnalysisManager;
+import com.yeshi.fanli.service.manger.IClipboardAnalysisResult;
+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;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
-import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import com.yeshi.fanli.util.cache.IntegralGetCacheManager;
@@ -74,8 +71,10 @@
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.brand.BrandInfoVO;
import com.yeshi.fanli.vo.brand.TaoBaoShopVO;
+import com.yeshi.fanli.vo.common.JumpDetailContentVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.msg.TokenVO;
+import com.yeshi.fanli.vo.search.GoodsDocParseResultVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -115,7 +114,7 @@
private TaoBaoShopService taoBaoShopService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@@ -128,6 +127,21 @@
@Resource
private IntegralGetCacheManager integralGetCacheManager;
+
+ @Resource
+ private BrandInfoService brandInfoService;
+
+ @Resource
+ private JDGoodsLinkParseManager jdGoodsLinkParseManager;
+
+ @Resource
+ private ClipboardAnalysisManager clipboardAnalysisManager;
+
+ @Resource
+ private JumpDetailV2Service jumpDetailV2Service;
+
+ @Resource
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
/**
* 绮樿创鏉夸俊鎭帹鑽�
@@ -145,364 +159,201 @@
}
// 鍘婚櫎鍓嶅悗绌烘牸
text = text.trim();
-
- try {
- TokenVO tokenVO = tokenRecordService.discernToken(text, uid, acceptData);
- out.print(JsonUtil.loadTrueResult(tokenVO));
- return;
- } catch (TokenRecordException e) {
- if (e.getCode() == 1001) { // 闇�瑕佺敤鎴风櫥褰�
- out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
- return;
- }
- }
-
- TaoBaoGoodsBrief tb = null;
- String URL_REGEX = "(((http|https)://)|(www\\.))[a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6}(:[0-9]{1,4})?(/[a-zA-Z0-9\\&%_\\./-~-]*)?";
-
- Pattern p = Pattern.compile(URL_REGEX);
- Matcher matcher = p.matcher(text);
- if (!matcher.find()) {// 涓嶅寘鍚摼鎺�
- if (text.length() > 256) {
- out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
- return;
- }
- String pattern = "^[A-Za-z0-9-]+$";
- if (Pattern.matches(pattern, text.replace(" ", ""))) {// 鍒犻櫎绌烘牸
- out.println(JsonUtil.loadFalseResult("涓嶆敮鎸佹帹鑽�"));
- return;
- }
-
- LogHelper.test("鏍规嵁绮樿创鏉挎帹鑽�:" + text);
-
- if (text.length() > 80) {
- out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
- return;
- }
-
- 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();
- data.put("title", text);
- root.put("data", data);
- out.print(JsonUtil.loadTrueResult(root));
- return;
- }
-
- int type = 3;
- CommonGoods commonGoods = null;
- text = matcher.group();
-
- if (text.startsWith("https://a.m.taobao.com/i"))// 娣樺疂璐﹀彿鏈櫥褰曠姸鎬�
- {
- text = text.substring("https://a.m.taobao.com/i".length(), text.indexOf(".htm"));
- if (NumberUtil.isNumeric(text)) {
- tb = TaoBaoUtil.isAlimama(text);
- }
- } else if (text.contains("ju.taobao.com") || text.contains(".juhuasuan.com")) {// 鑱氬垝绠�
- int index = text.indexOf("item_id");
- if (index < 0) {
- out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
- return;
- }
- text = text.substring(index);
- int last = text.indexOf("&");
- String id = "";
- if (last > 0)
- id = text.substring(text.indexOf("=") + 1, text.indexOf("&"));
- else {
- id = text.substring(text.indexOf("=" + 1));
- }
- tb = TaoBaoUtil.isAlimama(id);
- if (tb == null) {
- type = 4;
- tb = getTaoBaoGoodsBriefFromGoodsId(id);
- }
- } else if (text.contains("http://zmnxbc.com")) { // 鎵嬫満绔ぉ鐚獳PP鍒嗕韩
- tb = TaoBaoUtil.parsePhoneShareUrlByTM(text);
- } else if (text.contains("h5.m.taobao") || text.contains("detail.m.tmall") || text.contains("item.taobao")
- || text.contains("detail.tmall")) { // 鎵嬫満椤甸潰鍜岀數鑴戦〉闈�
- Map<String, String> map = Utils.parseURL(text);
- String id = "";
- id = map.get("id").replace("}", "");
- tb = TaoBaoUtil.isAlimama(id);
- if (tb == null) {
- type = 4;
- tb = getTaoBaoGoodsBriefFromGoodsId(id);
- }
- } 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);
- if (tb != null)
- type = 4;
- }
- }
-
- if (tb == null)// 娣樺疂鏄┖鍊�
- {
- String jdId = JDUtil.getJDGoodsId(text);
- if (!StringUtil.isNullOrEmpty(jdId)) {
- JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(jdId));
- if (goods != null) {
- // 楂樼骇鎺ュ彛 -- 淇℃伅鏇村畬鏁�
- 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);
- if (goods != null) {
- commonGoods = new CommonGoods();
- commonGoods.setTitle(goods.getSkuName());
- commonGoods.setPicture(goods.getPicUrl());
- }
- }
- } else {
- String pddId = PinDuoDuoUtil.getPDDGoodsId(text);
- if (!StringUtil.isNullOrEmpty(pddId)) {
- PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(pddId));
- if (goods != null) {
- commonGoods = CommonGoodsFactory.create(goods);
- } else {
- type = 4;
- goods = PinDuoDuoUtil.getPDDGoodsInfo(pddId);
- if (goods != null) {
- commonGoods = new CommonGoods();
- commonGoods.setTitle(goods.getGoodsName());
- commonGoods.setPicture(goods.getGoodsThumbnailUrl());
- }
- }
- }
- }
- }
- }
-
- 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())) {
- 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;
- }
+ String originalText = text;
JSONObject data = new JSONObject();
- if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
- if (tb != null) {
- TaoBaoGoodsBrief goodsBrief = null;
- try {
- goodsBrief = TaoKeApiUtil.searchGoodsDetail(tb.getAuctionId());
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- }
- if (goodsBrief == null) {
- out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
- return;
- }
- 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))));
- out.print(JsonUtil.loadTrueResult(data));
- return;
- }
+ clipboardAnalysisManager.parse(acceptData.getPlatform(), acceptData.getVersion(), originalText, uid,
+ new IClipboardAnalysisResult() {
- if (tb != null) {
- commonGoods = new CommonGoods();
- commonGoods.setPrice(tb.getZkPrice());
- commonGoods.setTitle(tb.getTitle());
- commonGoods.setGoodsId(tb.getAuctionId());
- commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
- commonGoods.setPicture(tb.getPictUrl());
- }
-
- JSONObject taoBaoGoodsJSON = new JSONObject();
- taoBaoGoodsJSON.put("title", commonGoods.getTitle());
- taoBaoGoodsJSON.put("zkPrice", commonGoods.getPrice() + "");
- taoBaoGoodsJSON.put("id", commonGoods.getGoodsId());
- taoBaoGoodsJSON.put("goodsType", commonGoods.getGoodsType());
- if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
- taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + commonGoods.getGoodsId());
- } else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_JD) {
- taoBaoGoodsJSON.put("url", String.format("https://item.jd.com/%s.html", commonGoods.getGoodsId() + ""));
- } else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_PDD) {
- taoBaoGoodsJSON.put("url", "http://yangkeduo.com/goods.html?goods_id=" + commonGoods.getGoodsId());
- }
- data.put("goods", taoBaoGoodsJSON);
- List<String> picList = new ArrayList<>();
- picList.add(commonGoods.getPicture());
- data.put("imgs", picList);
- JSONObject root = new JSONObject();
- 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;
- }
-
- /**
- * 瑙ｆ瀽鎶栭煶閾炬帴
- *
- * @param acceptData
- * @param text
- * @param out
- * @return
- */
- private void analysisDouYin(AcceptData acceptData, String text, PrintWriter out) {
- String location = HttpUtil.getLocation(text);
- if (!StringUtil.isNullOrEmpty(location)) {
- if (location.contains("taobao.com")) { // 娣樺疂鍟嗗搧
- String realUrl = TaoBaoUtil.getRealUrl(location);
- if (!StringUtil.isNullOrEmpty(realUrl)) {
- getRecommendInfo(acceptData, realUrl, null, out);
- return;
- }
- } else if (location.contains("haohuo.jinritemai.com")) { // 鎶栭煶鍟嗗搧
- DouYinGoods goods = DouYinUtil.getGoodsInfo(location);
- 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", "璇ュ晢鍝佹棤鎺ㄥ箍淇℃伅");
- data.put("goods", goodsJSON);
- out.print(JsonUtil.loadTrueResult(data));
- return;
- }
- }
- out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
- return;
- }
-
- /**
- * 瑙ｆ瀽娣樺彛浠�
- *
- * @param acceptData
- * @param text
- * @param out
- * @return
- */
- private boolean analysisTaoToken(AcceptData acceptData, String text, PrintWriter out) {
- String token = StringUtil.picUpTaoToken(text);
- if (!StringUtil.isNullOrEmpty(token)) {
- Long auctionId = TaoKeApiUtil.tokenConvertAuctionId(token);
- if (auctionId != null) {
- TaoBaoGoodsBrief tb = null;
- try {
- tb = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- }
-
- if (tb != null) {
- if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
- TaoBaoGoodsBrief goodsBrief = null;
- try {
- goodsBrief = TaoKeApiUtil.searchGoodsDetail(tb.getAuctionId());
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
+ @Override
+ public void onResult(GoodsDocParseResultVO result) {
+ if (uid == null) {
+ out.print(JsonUtil.loadFalseResult("鏃犳帹鑽�"));
+ return;
}
- 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 root = new JSONObject();
+ root.put("type", 20);
JSONObject data = new JSONObject();
- data.put("type", 3);
- data.put("goods", gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief,
- new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE))));
- out.print(JsonUtil.loadTrueResult(data));
- return true;
+ data.put("text", originalText);
+ //
+ int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
+ int version = Integer.parseInt(acceptData.getVersion());
+ JumpDetailContentVO convert = new JumpDetailContentVO();
+ convert.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", platformCode, version));
+ JSONObject convertParams = new JSONObject();
+ convertParams.put("url", configService.get(ConfigKeyEnum.convertDocWebLink.getKey()));
+ convertParams.put("clipboard", false);
+ convert.setParams(convertParams);
+
+ JumpDetailContentVO view = null;
+ JumpDetailContentVO guessLike = null;
+
+ Gson gson = JsonUtil.getApiCommonGson();
+ data.put("title", "鏅鸿兘鎼滅储");
+
+
+
+ int state = 0;
+ if (result.getFirstGoods() != null && result.getFirstGoods().getGoodsId() != null) {
+ state = 2;
+ data.put("stateDesc", "閫夋嫨鎼滃埜鎴栬浆閾�");
+ JSONObject params = new JSONObject();
+ params.put("id", result.getFirstGoods().getGoodsId()+"");
+ params.put("from", "杞摼");
+ if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
+ view = new JumpDetailContentVO();
+ view.setJumpDetail(
+ jumpDetailV2Service.getByTypeCache("goodsdetail", platformCode, version));
+ view.setParams(params);
+ } else if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_JD) {
+ view = new JumpDetailContentVO();
+ view.setJumpDetail(
+ jumpDetailV2Service.getByTypeCache("goodsdetail_jd", platformCode, version));
+ view.setParams(params);
+ } else if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_PDD) {
+ view = new JumpDetailContentVO();
+ view.setJumpDetail(
+ jumpDetailV2Service.getByTypeCache("goodsdetail_pdd", platformCode, version));
+ view.setParams(params);
+ }
+
+ } else if (!StringUtil.isNullOrEmpty(result.getFirstLink())) {
+ state = 2;
+ data.put("stateDesc", "閫夋嫨鎼滃埜鎴栬浆閾�");
+ view = new JumpDetailContentVO();
+ view.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", platformCode, version));
+ JSONObject params = new JSONObject();
+ params.put("url", result.getFirstLink());
+ view.setParams(params);
+ } else {
+ data.put("stateDesc", "鍘昏瘯璇曡浆閾�");
+ state = 1;
+ }
+ data.put("state", state);
+ if (convert != null)
+ data.put("convert", gson.toJson(convert));
+ if (view != null)
+ data.put("view", gson.toJson(view));
+
+ if (guessLike != null)
+ data.put("guessLike", gson.toJson(guessLike));
+
+ root.put("data", data);
+ out.print(JsonUtil.loadTrueResult(root));
+ return;
}
- JSONObject data = new JSONObject();
- JSONObject taoBaoGoodsJSON = new JSONObject();
- taoBaoGoodsJSON.put("title", tb.getTitle());
- taoBaoGoodsJSON.put("zkPrice", tb.getZkPrice());
- taoBaoGoodsJSON.put("id", tb.getAuctionId());
- taoBaoGoodsJSON.put("goodsType", Constant.SOURCE_TYPE_TAOBAO);
- taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + tb.getAuctionId());
- data.put("goods", taoBaoGoodsJSON);
- if (!StringUtil.isNullOrEmpty(tb.getPictUrl())) {
- if (tb.getImgList() == null)
- tb.setImgList(new ArrayList<>());
- tb.getImgList().add(0, TbImgUtil.getTBSize220Img(tb.getPictUrl()));
+ @Override
+ public void onResult(String result) {
+ JSONObject root = new JSONObject();
+ root.put("type", 2);
+ JSONObject data = new JSONObject();
+ data.put("title", result);
+ root.put("data", data);
+ out.print(JsonUtil.loadTrueResult(root));
+ return;
}
- data.put("imgs", tb.getImgList());
- JSONObject root = new JSONObject();
- root.put("type", 1);
- root.put("data", data);
- out.print(JsonUtil.loadTrueResult(root));
- return true;
- }
- }
- }
- return false;
+
+ @Override
+ public void onResult(CommonGoods goods) {
+ if (goods.getGoodsId() != null) {
+ if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {// 1.6.5鐗堟湰鍚庤繑鍥炲晢鍝佽鎯�
+ if (goods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
+ TaoBaoGoodsBrief goodsBrief = null;
+ try {
+ goodsBrief = TaoKeApiUtil.searchGoodsDetail(goods.getGoodsId());
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ }
+
+ if (goodsBrief != null) {
+ goods = CommonGoodsFactory.create(goodsBrief);
+ Gson gson = JsonUtil
+ .getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd")
+ .create();
+ data.put("type", 3);
+ data.put("goods",
+ gson.toJson(
+ GoodsDetailVOFactory.convertCommonGoods(goods,
+ orderHongBaoMoneyComputeService.getShowComputeRate(
+ acceptData.getPlatform(),
+ acceptData.getVersion()))));
+ out.print(JsonUtil.loadTrueResult(data));
+ return;
+ }
+ } else {
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd")
+ .create();
+ data.put("type", 3);
+ data.put("goods",
+ gson.toJson(
+ GoodsDetailVOFactory.convertCommonGoods(goods,
+ orderHongBaoMoneyComputeService.getShowComputeRate(
+ acceptData.getPlatform(),
+ acceptData.getVersion()))));
+ out.print(JsonUtil.loadTrueResult(data));
+ return;
+ }
+ } else {
+ // 浣庝簬1.6.5鐗堟湰
+ JSONObject taoBaoGoodsJSON = new JSONObject();
+ taoBaoGoodsJSON.put("title", goods.getTitle());
+ taoBaoGoodsJSON.put("zkPrice", goods.getPrice() + "");
+ taoBaoGoodsJSON.put("id", goods.getGoodsId());
+ taoBaoGoodsJSON.put("goodsType", goods.getGoodsType());
+ if (goods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
+ taoBaoGoodsJSON.put("url",
+ "http://item.taobao.com/item.htm?id=" + goods.getGoodsId());
+ } else if (goods.getGoodsType() == Constant.SOURCE_TYPE_JD) {
+ taoBaoGoodsJSON.put("url",
+ String.format("https://item.jd.com/%s.html", goods.getGoodsId() + ""));
+ } else if (goods.getGoodsType() == Constant.SOURCE_TYPE_PDD) {
+ taoBaoGoodsJSON.put("url",
+ "http://yangkeduo.com/goods.html?goods_id=" + goods.getGoodsId());
+ }
+ data.put("goods", taoBaoGoodsJSON);
+ List<String> picList = new ArrayList<>();
+ picList.add(goods.getPicture());
+ data.put("imgs", picList);
+ JSONObject root = new JSONObject();
+ root.put("type", 1);
+ root.put("data", data);
+ out.print(JsonUtil.loadTrueResult(root));
+ return;
+ }
+ }
+
+ JSONObject goodsJSON = new JSONObject();
+ goodsJSON.put("title", goods.getTitle());
+ goodsJSON.put("pictUrl", goods.getPicture());
+
+ data.put("type", 4);
+ data.put("desc", "璇ュ晢鍝佹棤鎺ㄥ箍淇℃伅");
+ data.put("goods", goodsJSON);
+ out.print(JsonUtil.loadTrueResult(data));
+ return;
+ }
+
+ @Override
+ public void onResult(TokenVO tokenVO) {
+ out.print(JsonUtil.loadTrueResult(tokenVO));
+ return;
+ }
+
+ @Override
+ public void none() {
+ out.print(JsonUtil.loadFalseResult("鏃犳帹鑽�"));
+ }
+
+ @Override
+ public void needLogin(String msg) {
+ out.print(JsonUtil.loadFalseResult(1001, msg));
+ }
+ });
}
/**
@@ -706,15 +557,15 @@
}
// 鎼滅储澶ф窐瀹�
- List<DaTaoKeDetail> daTaoKeList = null;
+ List<DaTaoKeDetailV2> daTaoKeList = null;
if (page == 1) {
- daTaoKeList = daTaoKeGoodsDetailService.listByDtitle(key);
+ daTaoKeList = daTaoKeGoodsDetailV2Service.listByDtitle(key);
}
// 娣樺疂api鎼滅储鍟嗗搧
TaoBaoSearchResult result = TaoBaoUtil.search(sf);
- // 鎼滅储鏄惁鍦ㄨ惀閿�涓诲晢鍝佸簱
+ // 鎼滅储缁撴灉缂撳瓨鍒皉edis
if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) {
ThreadUtil.run(new Runnable() {
@Override
@@ -737,7 +588,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) {
@@ -745,9 +596,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);
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {
list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));
@@ -761,25 +611,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));
}
@@ -799,7 +664,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));
@@ -937,12 +802,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);
-
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
for (JDGoods goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
if (hasCoupon) {
@@ -1023,9 +886,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);
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
for (PDDGoodsDetail goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);
--
Gitblit v1.8.0