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 | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 71 insertions(+), 8 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 cfe3891..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
@@ -34,6 +34,7 @@
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,11 +46,13 @@
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;
@@ -62,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;
@@ -105,6 +109,9 @@
@Resource(name = "taskExecutor")
private TaskExecutor executor;
+
+ @Resource
+ private TokenRecordService tokenRecordService;
/**
* 绮樿创鏉夸俊鎭帹鑽�
@@ -115,18 +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;
}
// 鍘婚櫎鍓嶅悗绌烘牸
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;
String URL_REGEX = "(((http|https)://)|(www\\.))[a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6}(:[0-9]{1,4})?(/[a-zA-Z0-9\\&%_\\./-~-]*)?";
@@ -134,8 +148,12 @@
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)) {
+ if (Pattern.matches(pattern, text.replace(" ", ""))) {//鍒犻櫎绌烘牸
out.println(JsonUtil.loadFalseResult("涓嶆敮鎸佹帹鑽�"));
return;
}
@@ -217,6 +235,33 @@
return;
}
+
+ 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", 3);
+ data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate)));
+ out.print(JsonUtil.loadTrueResult(data));
+ return;
+ }
+
if (tb != null) {
commonGoods = new CommonGoods();
commonGoods.setPrice(tb.getZkPrice());
@@ -225,8 +270,7 @@
commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
commonGoods.setPicture(tb.getPictUrl());
}
-
- JSONObject data = new JSONObject();
+
JSONObject taoBaoGoodsJSON = new JSONObject();
taoBaoGoodsJSON.put("title", commonGoods.getTitle());
taoBaoGoodsJSON.put("zkPrice", commonGoods.getPrice() + "");
@@ -246,7 +290,6 @@
JSONObject root = new JSONObject();
root.put("type", 1);
root.put("data", data);
-
out.print(JsonUtil.loadTrueResult(root));
}
@@ -288,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