From 7f2f5ef5637a6871f4329e464eeba97eb59e94a3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 21 八月 2019 10:45:38 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 146 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 117 insertions(+), 29 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 3e8b365..dbde4ce 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
@@ -16,7 +16,6 @@
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;
@@ -28,12 +27,14 @@
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;
@@ -45,12 +46,15 @@
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.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;
@@ -61,6 +65,7 @@
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;
@@ -104,6 +109,9 @@
@Resource(name = "taskExecutor")
private TaskExecutor executor;
+
+ @Resource
+ private TokenRecordService tokenRecordService;
/**
* 绮樿创鏉夸俊鎭帹鑽�
@@ -114,16 +122,25 @@
* @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;
}
-
- if (text.length() > 256) {
- out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
+ // 鍘婚櫎鍓嶅悗绌烘牸
+ text = text.trim();
+
+ 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;
String URL_REGEX = "(((http|https)://)|(www\\.))[a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6}(:[0-9]{1,4})?(/[a-zA-Z0-9\\&%_\\./-~-]*)?";
@@ -131,17 +148,13 @@
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;
}
-
- if (NumberUtil.isNumeric(text)) {
- out.println(JsonUtil.loadFalseResult("涓嶆敮鎸佺函鏁板瓧"));
+ String pattern = "^[A-Za-z0-9-]+$";
+ if (Pattern.matches(pattern, text.replace(" ", ""))) {//鍒犻櫎绌烘牸
+ out.println(JsonUtil.loadFalseResult("涓嶆敮鎸佹帹鑽�"));
return;
}
@@ -166,6 +179,7 @@
return;
}
+ CommonGoods commonGoods = null;
text = matcher.group();
if (text.contains("ju.taobao.com") || text.contains(".juhuasuan.com")) {// 鑱氬垝绠�
int index = text.indexOf("item_id");
@@ -198,30 +212,84 @@
}
} 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));
}
@@ -263,6 +331,26 @@
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()));
+ }
+ }
+
+
+
/**
* 鎼滅储鍊欓�夎瘝
*
--
Gitblit v1.8.0