From c899ea177bf13045f9476f602697c6a762d8c532 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 03 九月 2019 15:39:05 +0800
Subject: [PATCH] 活动列表版本区分
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 243 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 211 insertions(+), 32 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 c4eab0d..465af3a 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,12 +10,14 @@
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.JsonUtil;
+import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.taobao.TbImgUtil;
import com.google.gson.Gson;
@@ -27,28 +29,36 @@
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.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.exception.taobao.TaobaoGoodsDownException;
+import com.yeshi.fanli.exception.user.TokenRecordException;
import com.yeshi.fanli.log.LogHelper;
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.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
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.user.HistorySearchService;
+import com.yeshi.fanli.service.inter.user.TokenRecordService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
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.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;
@@ -56,8 +66,10 @@
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.TaoBaoShopVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+import com.yeshi.fanli.vo.msg.TokenVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -102,6 +114,15 @@
@Resource(name = "taskExecutor")
private TaskExecutor executor;
+ @Resource
+ private TokenRecordService tokenRecordService;
+
+ @Resource
+ private IntegralGetService integralGetService;
+
+ @Resource
+ private IntegralGetCacheManager integralGetCacheManager;
+
/**
* 绮樿创鏉夸俊鎭帹鑽�
*
@@ -111,15 +132,23 @@
* @param out
*/
@RequestMapping(value = "getRecommendInfo", method = RequestMethod.POST)
- public void getRecommendInfo(AcceptData acceptData, String text, PrintWriter out) {
+ public void getRecommendInfo(AcceptData acceptData, String text, Long uid, PrintWriter out) {
if (StringUtil.isNullOrEmpty(text)) {
out.print(JsonUtil.loadFalseResult("鍊间负绌�"));
return;
}
+ // 鍘婚櫎鍓嶅悗绌烘牸
+ text = text.trim();
- if (text.length() > 256) {
- out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
+ try {
+ TokenVO tokenVO = tokenRecordService.discernToken(text, uid);
+ 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;
@@ -128,13 +157,14 @@
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);
+ 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);
@@ -143,6 +173,11 @@
out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
return;
}
+
+ if (analysisTaoToken(text, out)) {
+ return;
+ }
+
JSONObject root = new JSONObject();
root.put("type", 2);
@@ -153,8 +188,16 @@
return;
}
+ CommonGoods commonGoods = null;
text = matcher.group();
- if (text.contains("ju.taobao.com") || text.contains(".juhuasuan.com")) {// 鑱氬垝绠�
+
+ 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("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
@@ -185,31 +228,141 @@
}
} else {
tb = TaoBaoUtil.parsePhoneShareUrlByTB(text);
+ if (tb == null)// 娣樺疂鏄┖鍊�
+ {
+ String jdId = JDUtil.getJDGoodsId(text);
+ if (!StringUtil.isNullOrEmpty(jdId)) {
+ JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(jdId));
+ if (goods != null)
+ commonGoods = CommonGoodsFactory.create(goods);
+ } else {
+ String pddId = PinDuoDuoUtil.getPDDGoodsId(text);
+ if (!StringUtil.isNullOrEmpty(pddId)) {
+ PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(pddId));
+ if (goods != null)
+ commonGoods = CommonGoodsFactory.create(goods);
+ }
+ }
+ }
}
- if (tb == null) {
+ if (tb == null && commonGoods == 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("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()));
+
+ 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", 3);
+ data.put("goods",
+ gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate)));
+ out.print(JsonUtil.loadTrueResult(data));
+ return;
}
- data.put("imgs", tb.getImgList());
+
+ 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 boolean analysisTaoToken(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) {
+ 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()));
+ }
+ 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;
+ }
+
+ /**
+ * 鍙ｄ护棰嗗彇
+ *
+ * @param acceptData
+ * @param kw
+ * @param goodsType
+ * @param out
+ */
+ @RequestMapping(value = "tokenReceive", method = RequestMethod.POST)
+ public void tokenReceive(AcceptData acceptData, Long uid, String token, PrintWriter out) {
+ try {
+ String msg = tokenRecordService.receiveToken(token, uid);
+ out.print(JsonUtil.loadTrueResult(msg));
+ } catch (TokenRecordException e) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+ }
}
/**
@@ -264,7 +417,8 @@
*/
@RequestMapping(value = "searchGoods")
public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter,
- Integer order, PrintWriter out) {
+ Integer order, Long uid, HttpSession session, PrintWriter out) {
+
if (goodsType == null || goodsType < 1 || goodsType > 3) {
out.print(JsonUtil.loadFalseResult(1, "璇蜂紶閫掓纭钩鍙板弬鏁�"));
return;
@@ -280,6 +434,24 @@
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
@@ -451,6 +623,7 @@
private void searchJDGoods(String key, Integer page, String filter, Integer order, PrintWriter out) {
JDSearchResult result = null;
+ boolean hasCoupon = false;
String way = configService.get("jd_api_search_key");
if ("1".equals(way)) {
JDFilter filterAPI = new JDFilter();
@@ -486,6 +659,7 @@
JSONObject jsonfilter = JSONObject.fromObject(filter);
Boolean coupon = jsonfilter.optBoolean("coupon");
if (coupon != null && coupon) {
+ hasCoupon = true;
filterAPI.setIsCoupon(1); // 鏈夊埜
}
@@ -541,6 +715,7 @@
JSONObject jsonfilter = JSONObject.fromObject(filter);
Boolean coupon = jsonfilter.optBoolean("coupon");
if (coupon != null && coupon) {
+ hasCoupon = true;
jdfilter.setHasCoupon(1); // 鏈夊埜
}
@@ -592,9 +767,14 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
for (JDGoods goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,
- shareRate);
- array.add(gson.toJson(goodsDetailVO));
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
+ if (hasCoupon) {
+ if (goodsDetailVO.isHasCoupon()) {
+ array.add(gson.toJson(goodsDetailVO));
+ }
+ } else {
+ array.add(gson.toJson(goodsDetailVO));
+ }
}
}
}
@@ -605,7 +785,7 @@
}
/**
- * 浜笢
+ * 鎷煎澶�
*
* @param kw
* @param page
@@ -669,8 +849,7 @@
BigDecimal shareRate = hongBaoManageService.getShareRate();
for (PDDGoodsDetail goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate,
- shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);
array.add(gson.toJson(goodsDetailVO));
}
}
--
Gitblit v1.8.0