From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 579 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 392 insertions(+), 187 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 ee7f93d..656ff83 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
@@ -10,16 +10,21 @@
import java.util.regex.Pattern;
import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
import org.springframework.core.task.TaskExecutor;
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;
@@ -27,29 +32,45 @@
import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
import com.yeshi.fanli.dto.pdd.PDDSearchFilter;
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.TaoBaoTokenParseException;
+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.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
+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.GsonUtil;
+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;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
+import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.jd.JDUtil;
@@ -57,8 +78,13 @@
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
import com.yeshi.fanli.util.taobao.SearchFilterUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
+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;
@@ -98,13 +124,32 @@
private TaoBaoShopService taoBaoShopService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
-
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
+
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
-
+ @Resource
+ private TokenRecordService tokenRecordService;
+
+ @Resource
+ private IntegralGetService integralGetService;
+
+ @Resource
+ private IntegralGetCacheManager integralGetCacheManager;
+
+ @Resource
+ private BrandInfoService brandInfoService;
+
+ @Resource
+ private JDGoodsLinkParseManager jdGoodsLinkParseManager;
+
+ @Resource
+ private ClipboardAnalysisManager clipboardAnalysisManager;
+
+ @Resource
+ private JumpDetailV2Service jumpDetailV2Service;
+
/**
* 绮樿创鏉夸俊鎭帹鑽�
*
@@ -113,133 +158,230 @@
* 鍟嗗搧閾炬帴
* @param out
*/
- @RequestMapping(value = "getNewGoodsInfo", method = RequestMethod.POST)
- public void getNewGoodsInfo(AcceptData acceptData, String text, PrintWriter out) {
+ @RequestMapping(value = "getRecommendInfo", method = RequestMethod.POST)
+ public void getRecommendInfo(AcceptData acceptData, String text, Long uid, PrintWriter out) {
if (StringUtil.isNullOrEmpty(text)) {
out.print(JsonUtil.loadFalseResult("鍊间负绌�"));
return;
}
+ // 鍘婚櫎鍓嶅悗绌烘牸
+ text = text.trim();
+ String originalText = text;
- if (text.length() > 256) {
- out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
- return;
- }
+ JSONObject data = new JSONObject();
- 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\\&%_\\./-~-]*)?";
+ clipboardAnalysisManager.parse(acceptData.getPlatform(), acceptData.getVersion(), originalText, uid,
+ new IClipboardAnalysisResult() {
- Pattern p = Pattern.compile(URL_REGEX);
- Matcher matcher = p.matcher(text);
- if (!matcher.find()) {// 涓嶅寘鍚摼鎺�
- // 鍟嗗搧璇︽儏
- // 鍙戠幇
- // 娌℃湁閾炬帴锛屾爣棰樿繃闀夸篃涓嶅鐞�
- if (text.startsWith("銆�") && text.contains("銆�")) {
- int end = text.indexOf("銆�");
- if (end > 2)
- text = text.substring(1, end);
- }
+ @Override
+ public void onResult(GoodsDocParseResultVO result) {
+ if (uid == null) {
+ out.print(JsonUtil.loadFalseResult("鏃犳帹鑽�"));
+ return;
+ }
- LogHelper.test("鏍规嵁绮樿创鏉挎帹鑽�:" + text);
-
- if (text.length() > 80) {
- out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
- return;
- }
-
- SearchFilter sf = new SearchFilter();
- sf.setKey(text);
- JSONObject root = new JSONObject();
-
- TaoBaoSearchResult result = TaoBaoUtil.search(sf);
- if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0)
- for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {
- // 鏄睘浜庢窐瀹濊仈鐩熷晢鍝�
- if (goods.getTitle().equalsIgnoreCase(text)) {
- root.put("type", 2);
+ JSONObject root = new JSONObject();
+ root.put("type", 20);
JSONObject data = new JSONObject();
- data.put("title", goods.getTitle());
+ 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;
}
- }
- // 鏌ヨ澶ф窐瀹㈡爣棰�
- List<DaTaoKeDetail> list = daTaoKeGoodsDetailService.listByDtitle(text);
- if (list != null && list.size() > 0) {
- root.put("type", 2);
- JSONObject data = new JSONObject();
- data.put("title", list.get(0).getdTitle());
- root.put("data", data);
- out.print(JsonUtil.loadTrueResult(root));
- return;
- }
+ @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;
+ }
- out.print(JsonUtil.loadFalseResult("鏆備笉鏀寔璇ョ被鍨嬶紒"));
- return;
- }
+ @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();
+ }
- text = matcher.group();
- 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) {
- tb = TaoBaoUtil.parsePhoneTmAndTb(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) {
- tb = TaoBaoUtil.parsePhoneTmAndTb(id);
- }
- } else {
- tb = TaoBaoUtil.parsePhoneShareUrlByTB(text);
- }
+ 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,
+ hongBaoManageService.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,
+ hongBaoManageService.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;
+ }
+ }
- if (tb == null) {
- out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
- return;
- }
- JSONObject data = new JSONObject();
- JSONObject taoBaoGoodsJSON = new JSONObject();
- taoBaoGoodsJSON.put("title", tb.getTitle());
- taoBaoGoodsJSON.put("zkPrice", tb.getZkPrice());
- taoBaoGoodsJSON.put("auctionId", tb.getAuctionId());
- taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + tb.getAuctionId());
- data.put("taoBaoGoodsBrief", taoBaoGoodsJSON);
- if (!StringUtil.isNullOrEmpty(tb.getPictUrl())) {
- if (tb.getImgList() == null)
- tb.setImgList(new ArrayList<>());
- tb.getImgList().add(0, TbImgUtil.getTBSize220Img(tb.getPictUrl()));
- }
- data.put("tbImgs", tb.getImgList());
- JSONObject root = new JSONObject();
- root.put("type", 1);
- root.put("data", data);
+ JSONObject goodsJSON = new JSONObject();
+ goodsJSON.put("title", goods.getTitle());
+ goodsJSON.put("pictUrl", goods.getPicture());
- out.print(JsonUtil.loadTrueResult(root));
+ 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));
+ }
+ });
}
-
-
-
+
+ /**
+ * 鍙ｄ护棰嗗彇
+ *
+ * @param acceptData
+ * @param kw
+ * @param goodsType
+ * @param out
+ */
+ @RequestSerializableByKey(key = "'tokenReceive-'+#uid")
+ @RequestMapping(value = "tokenReceive", method = RequestMethod.POST)
+ public void tokenReceive(AcceptData acceptData, Long uid, String token, PrintWriter out) {
+ try {
+ String msg = tokenRecordService.receiveToken(token, uid, acceptData);
+ out.print(JsonUtil.loadTrueResult(msg));
+ } catch (TokenRecordException e) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+ }
+ }
+
/**
* 鎼滅储鍊欓�夎瘝
*
@@ -282,32 +424,52 @@
* @param kw
* @param page
* @param filter
- * @param order 閿�閲忕敱楂樺埌浣�:1 銆� 浠锋牸浠庨珮鍒颁綆:2 銆� 浠锋牸浠庝綆鍒伴珮:3 銆� 鎺ㄥ箍閲忛珮鍒颁綆:4锛堢患鍚堥粯璁わ級銆佽繑鍒╂瘮楂樺埌浣�:5
- * 銆佽繑鍒╂瘮浣庡埌楂�:6 銆佹帹鑽�20
+ * @param order
+ * 閿�閲忕敱楂樺埌浣�:1 銆� 浠锋牸浠庨珮鍒颁綆:2 銆� 浠锋牸浠庝綆鍒伴珮:3 銆� 鎺ㄥ箍閲忛珮鍒颁綆:4锛堢患鍚堥粯璁わ級銆佽繑鍒╂瘮楂樺埌浣�:5
+ * 銆佽繑鍒╂瘮浣庡埌楂�:6 銆佹帹鑽�20
* @param startprice
* @param endprice
* @param fastFilter
* @param out
*/
@RequestMapping(value = "searchGoods")
- public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter, Integer order,
- PrintWriter out) {
- if (goodsType == null || goodsType < 1 || goodsType >3) {
+ public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter,
+ Integer order, Long uid, HttpSession session, PrintWriter out) {
+
+ if (goodsType == null || goodsType < 1 || goodsType > 3) {
out.print(JsonUtil.loadFalseResult(1, "璇蜂紶閫掓纭钩鍙板弬鏁�"));
return;
}
-
+
if (page == null || page < 1) {
out.print(JsonUtil.loadFalseResult(1, "椤电爜涓嶈兘灏忎簬1"));
return;
}
-
+
if (StringUtil.isNullOrEmpty(key)) {
out.print(JsonUtil.loadFalseResult(1, "璇疯緭鍏ユ悳绱㈠唴瀹�"));
return;
}
final String searchkey = key.trim();
-
+
+ if (uid != null) {
+ if (page == 1) {
+ integralGetCacheManager.cacheSearchGoods(acceptData.getDevice(), System.currentTimeMillis());
+ } else if (page > 1) {
+ Long lastTime = integralGetCacheManager.getLastSearchTime(acceptData.getDevice());
+ if (lastTime != null && System.currentTimeMillis() - lastTime >= 15 * 1000L) {// 瓒呰繃15s娴忚
+ integralGetCacheManager.clearSearchTime(acceptData.getDevice());
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ // 澧炲姞閲戝竵
+ integralGetService.addSearchResultScan(uid, key);
+ }
+ });
+ }
+ }
+ }
+
executor.execute(new Runnable() {
@Override
public void run() {
@@ -318,12 +480,11 @@
String device = acceptData.getDevice();
sb.append(platform).append(link).append(packages).append(link).append(device);
String bid = StringUtil.Md5(sb.toString());
-
+
// 鍔犲叆鎼滅储鍘嗗彶璁板綍
historySearchService.addHistorySearch(searchkey, bid);
}
});
-
if (searchkey.startsWith("http://") || searchkey.startsWith("https://")) {
JSONObject data = new JSONObject();
@@ -333,20 +494,20 @@
return;
}
- /*--------- 浜笢鍟嗗搧 -------*/
+ /*--------- 浜笢鍟嗗搧 -------*/
if (goodsType.intValue() == Constant.SOURCE_TYPE_JD) {
- searchJDGoods(searchkey, page, filter, order, out);
+ searchJDGoods(acceptData, searchkey, page, filter, order, out);
return;
}
- /*-------- 鎷煎澶氬晢鍝� -------*/
+ /*-------- 鎷煎澶氬晢鍝� -------*/
if (goodsType.intValue() == Constant.SOURCE_TYPE_PDD) {
- searchPDDGoods(searchkey, page, filter, order, out);
+ searchPDDGoods(acceptData, searchkey, page, filter, order, out);
return;
}
- /*-------- 娣樺疂鍟嗗搧 -------*/
- searchTaoBaoGoods(searchkey, page, filter, order, out);
+ /*-------- 娣樺疂鍟嗗搧 -------*/
+ searchTaoBaoGoods(acceptData, searchkey, page, filter, order, out);
}
/**
@@ -360,7 +521,8 @@
* @param endprice
* @return
*/
- private void searchTaoBaoGoods(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);
@@ -376,25 +538,25 @@
} else if (order == 4) { // 杩斿埄姣旈珮鍒颁綆
sf.setSort(TaoBaoUtil.SORT_TKRATE_HIGH_TO_LOW);
}
- }
-
+ }
+
if (!StringUtil.isNullOrEmpty(filter)) {
JSONObject jsonfilter = JSONObject.fromObject(filter);
Boolean coupon = jsonfilter.optBoolean("coupon");
if (coupon != null && coupon) {
sf.setQuan(1); // 鏈夊埜
}
-
+
Boolean tmall = jsonfilter.optBoolean("tmall");
if (tmall != null && tmall) {
sf.setTmall(true); // 澶╃尗
}
-
+
String minPrice = jsonfilter.optString("minPrice");
if (!StringUtil.isNullOrEmpty(minPrice)) {
sf.setStartPrice(new BigDecimal(minPrice));
}
-
+
String maxPrice = jsonfilter.optString("maxPrice");
if (!StringUtil.isNullOrEmpty(maxPrice)) {
sf.setEndPrice(new BigDecimal(maxPrice));
@@ -402,14 +564,14 @@
}
// 鎼滅储澶ф窐瀹�
- 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);
-
+
// 鎼滅储鏄惁鍦ㄨ惀閿�涓诲晢鍝佸簱
if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) {
ThreadUtil.run(new Runnable() {
@@ -421,7 +583,7 @@
}
});
}
-
+
List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = null;
if (result != null) {
taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();
@@ -429,42 +591,69 @@
if (taoBaoGoodsBriefs == null) {
taoBaoGoodsBriefs = new ArrayList<>();
}
-
+
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) {
}
}
-
+
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())
.excludeFieldsWithoutExposeAnnotation().create();
-
+
JSONObject data = new JSONObject();
data.put("result", gson.toJson(list));
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) {
- data.put("shop", JsonUtil.getApiCommonGson().toJson(listShop.get(0)));
+ if (page == 1) { // 绗竴椤佃繑鍥炲簵閾轰俊鎭�
+ 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 {
+ 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));
}
-
/**
* 浜笢
@@ -477,10 +666,12 @@
* @param endprice
* @return
*/
- private void searchJDGoods(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;
- String way = configService.get("jd_api_search_key");
+ boolean hasCoupon = false;
+ String way = configService.get(ConfigKeyEnum.jdApiSearchKey.getKey());
if ("1".equals(way)) {
JDFilter filterAPI = new JDFilter();
filterAPI.setKeyword(SearchFilterUtil.filterSearchContent(key));
@@ -511,31 +702,30 @@
}
}
-
if (!StringUtil.isNullOrEmpty(filter)) {
JSONObject jsonfilter = JSONObject.fromObject(filter);
Boolean coupon = jsonfilter.optBoolean("coupon");
if (coupon != null && coupon) {
+ hasCoupon = true;
filterAPI.setIsCoupon(1); // 鏈夊埜
}
-
+
Boolean zy = jsonfilter.optBoolean("zy");
if (zy != null && zy) {
filterAPI.setOwner("g"); // 鑷惀
}
-
-
+
String minPrice = jsonfilter.optString("minPrice");
if (!StringUtil.isNullOrEmpty(minPrice)) {
filterAPI.setPricefrom(Double.parseDouble(minPrice));
}
-
+
String maxPrice = jsonfilter.optString("maxPrice");
if (!StringUtil.isNullOrEmpty(maxPrice)) {
filterAPI.setPriceto(Double.parseDouble(maxPrice));
}
}
-
+
result = JDApiUtil.queryByKey(filterAPI);
} else {
// 缃戦〉鐖彇
@@ -572,33 +762,42 @@
JSONObject jsonfilter = JSONObject.fromObject(filter);
Boolean coupon = jsonfilter.optBoolean("coupon");
if (coupon != null && coupon) {
+ hasCoupon = true;
jdfilter.setHasCoupon(1); // 鏈夊埜
}
-
+
Boolean zy = jsonfilter.optBoolean("zy");
if (zy != null && zy) {
jdfilter.setIsZY(1); // 鑷惀
}
-
+
Boolean delivery = jsonfilter.optBoolean("delivery");
if (delivery != null && delivery) {
jdfilter.setDeliveryType(1); // 浜笢閰嶉��
}
-
+
String minPrice = jsonfilter.optString("minPrice");
if (!StringUtil.isNullOrEmpty(minPrice)) {
+ if (minPrice.contains(".")) {
+ minPrice = minPrice.replace(".", "-");
+ minPrice = minPrice.split("-")[0];
+ }
jdfilter.setFromPrice(Integer.parseInt(minPrice));
}
-
+
String maxPrice = jsonfilter.optString("maxPrice");
if (!StringUtil.isNullOrEmpty(maxPrice)) {
+ if (maxPrice.contains(".")) {
+ maxPrice = maxPrice.replace(".", "-");
+ maxPrice = maxPrice.split("-")[0];
+ }
jdfilter.setToPrice(Integer.parseInt(maxPrice));
}
}
result = JDUtil.searchByKey(jdfilter);
-
+
}
-
+
long count = 0;
JSONObject data = new JSONObject();
JSONArray array = new JSONArray();
@@ -610,14 +809,19 @@
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, null, fanLiRate,
- shareRate);
- array.add(gson.toJson(goodsDetailVO));
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
+ if (hasCoupon) {
+ if (goodsDetailVO.isHasCoupon()) {
+ array.add(gson.toJson(goodsDetailVO));
+ }
+ } else {
+ array.add(gson.toJson(goodsDetailVO));
+ }
}
}
}
@@ -628,7 +832,7 @@
}
/**
- * 浜笢
+ * 鎷煎澶�
*
* @param kw
* @param page
@@ -638,7 +842,8 @@
* @param endprice
* @return
*/
- private void searchPDDGoods(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);
@@ -664,14 +869,14 @@
break;
}
}
-
+
if (!StringUtil.isNullOrEmpty(filter)) {
JSONObject jsonfilter = JSONObject.fromObject(filter);
Boolean coupon = jsonfilter.optBoolean("coupon");
if (coupon != null && coupon) {
pddfilter.setHasCoupon(true); // 鏈夊埜
}
-
+
Boolean brand = jsonfilter.optBoolean("brand");
if (brand != null && brand) {
pddfilter.setIsBrand(true); // 鏄惁鏄搧鐗�
@@ -685,15 +890,15 @@
PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
if (result != null) {
count = result.getTotalCount();
+ 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, null, fanLiRate,
- shareRate);
- array.add(GsonUtil.toJsonExpose(goodsDetailVO));
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);
+ array.add(gson.toJson(goodsDetailVO));
}
}
}
--
Gitblit v1.8.0