From d085ca89e39b4cda025a9a53d3797fbe8b242ae7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 21 十月 2019 17:11:30 +0800
Subject: [PATCH] 订单补偿 + 奖励券使用倒计时
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 277 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 240 insertions(+), 37 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 030f0bb..3f24588 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,20 @@
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.douyin.DouYinGoods;
import com.yeshi.fanli.dto.jd.JDFilter;
import com.yeshi.fanli.dto.jd.JDSearchFilter;
import com.yeshi.fanli.dto.jd.JDSearchResult;
@@ -39,20 +43,24 @@
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.user.HistorySearchService;
import com.yeshi.fanli.service.inter.user.TokenRecordService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
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;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
@@ -63,6 +71,7 @@
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.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.msg.TokenVO;
@@ -109,9 +118,15 @@
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
+
@Resource
private TokenRecordService tokenRecordService;
+
+ @Resource
+ private IntegralGetService integralGetService;
+
+ @Resource
+ private IntegralGetCacheManager integralGetCacheManager;
/**
* 绮樿创鏉夸俊鎭帹鑽�
@@ -129,7 +144,7 @@
}
// 鍘婚櫎鍓嶅悗绌烘牸
text = text.trim();
-
+
try {
TokenVO tokenVO = tokenRecordService.discernToken(text, uid);
out.print(JsonUtil.loadTrueResult(tokenVO));
@@ -140,7 +155,6 @@
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\\&%_\\./-~-]*)?";
@@ -153,7 +167,7 @@
return;
}
String pattern = "^[A-Za-z0-9-]+$";
- if (Pattern.matches(pattern, text.replace(" ", ""))) {//鍒犻櫎绌烘牸
+ if (Pattern.matches(pattern, text.replace(" ", ""))) {// 鍒犻櫎绌烘牸
out.println(JsonUtil.loadFalseResult("涓嶆敮鎸佹帹鑽�"));
return;
}
@@ -165,12 +179,13 @@
return;
}
- if (analysisTaoToken(text, out)) {
+ if (analysisTaoToken(acceptData, text, out)) {
return;
}
+ if (!StringUtil.isNullOrEmpty(TaoBaoUtil.parseSystemTaoToken(text)))
+ return;
JSONObject root = new JSONObject();
-
root.put("type", 2);
JSONObject data = new JSONObject();
data.put("title", text);
@@ -179,9 +194,17 @@
return;
}
+ int type = 3;
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("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
@@ -197,7 +220,8 @@
}
tb = TaoBaoUtil.isAlimama(id);
if (tb == null) {
- tb = TaoBaoUtil.parsePhoneTmAndTb(id);
+ type = 4;
+ tb = TaoBaoUtil.getTmallGoodsInfo(id);
}
} else if (text.contains("http://zmnxbc.com")) { // 鎵嬫満绔ぉ鐚獳PP鍒嗕韩
tb = TaoBaoUtil.parsePhoneShareUrlByTM(text);
@@ -208,23 +232,61 @@
id = map.get("id").replace("}", "");
tb = TaoBaoUtil.isAlimama(id);
if (tb == null) {
- tb = TaoBaoUtil.parsePhoneTmAndTb(id);
+ type = 4;
+ tb = TaoBaoUtil.getTmallGoodsInfo(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 = TaoBaoUtil.getTmallGoodsInfo(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)
- commonGoods = CommonGoodsFactory.create(goods);
+ 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)
+ 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());
+ }
+ }
}
}
}
@@ -235,10 +297,38 @@
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;
+ }
JSONObject data = new JSONObject();
-
- if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
if (tb != null) {
TaoBaoGoodsBrief goodsBrief = null;
try {
@@ -252,16 +342,18 @@
}
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)));
+ data.put("type", type);
+ 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());
@@ -270,7 +362,7 @@
commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
commonGoods.setPicture(tb.getPictUrl());
}
-
+
JSONObject taoBaoGoodsJSON = new JSONObject();
taoBaoGoodsJSON.put("title", commonGoods.getTitle());
taoBaoGoodsJSON.put("zkPrice", commonGoods.getPrice() + "");
@@ -293,7 +385,50 @@
out.print(JsonUtil.loadTrueResult(root));
}
- private boolean analysisTaoToken(String text, PrintWriter out) {
+ /**
+ * 瑙ｆ瀽鎶栭煶閾炬帴
+ *
+ * @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);
@@ -306,6 +441,32 @@
}
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();
+ }
+
+ 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 data = new JSONObject();
+ data.put("type", 3);
+ data.put("goods", gson
+ .toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief, null, fanLiRate, shareRate)));
+ out.print(JsonUtil.loadTrueResult(data));
+ return true;
+ }
+
JSONObject data = new JSONObject();
JSONObject taoBaoGoodsJSON = new JSONObject();
taoBaoGoodsJSON.put("title", tb.getTitle());
@@ -331,26 +492,25 @@
return false;
}
-
/**
+ * 鍙ｄ护棰嗗彇
*
* @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 {
- tokenRecordService.receiveToken(token, uid);
- out.print(JsonUtil.loadTrueResult("棰嗗彇鎴愬姛"));
+ String msg = tokenRecordService.receiveToken(token, uid);
+ out.print(JsonUtil.loadTrueResult(msg));
} catch (TokenRecordException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
}
}
-
-
-
+
/**
* 鎼滅储鍊欓�夎瘝
*
@@ -403,7 +563,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;
@@ -419,6 +580,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
@@ -446,18 +625,18 @@
/*--------- 浜笢鍟嗗搧 -------*/
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);
}
/**
@@ -471,7 +650,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);
@@ -565,12 +745,24 @@
data.put("result", gson.toJson(list));
data.put("count", result.getTaoBaoHead().getDocsfound());
- if (page == 1) {
- // 绗竴椤佃繑鍥炲簵閾轰俊鎭�
+ 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)));
+ 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());
+ data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO));
+ } else {
+ data.put("shop", JsonUtil.getApiCommonGson().toJson(taoBaoShop));
+ }
}
}
out.print(JsonUtil.loadTrueResult(data));
@@ -587,9 +779,11 @@
* @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;
+ boolean hasCoupon = false;
String way = configService.get("jd_api_search_key");
if ("1".equals(way)) {
JDFilter filterAPI = new JDFilter();
@@ -625,6 +819,7 @@
JSONObject jsonfilter = JSONObject.fromObject(filter);
Boolean coupon = jsonfilter.optBoolean("coupon");
if (coupon != null && coupon) {
+ hasCoupon = true;
filterAPI.setIsCoupon(1); // 鏈夊埜
}
@@ -680,6 +875,7 @@
JSONObject jsonfilter = JSONObject.fromObject(filter);
Boolean coupon = jsonfilter.optBoolean("coupon");
if (coupon != null && coupon) {
+ hasCoupon = true;
jdfilter.setHasCoupon(1); // 鏈夊埜
}
@@ -732,7 +928,13 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
for (JDGoods goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
- array.add(gson.toJson(goodsDetailVO));
+ if (hasCoupon) {
+ if (goodsDetailVO.isHasCoupon()) {
+ array.add(gson.toJson(goodsDetailVO));
+ }
+ } else {
+ array.add(gson.toJson(goodsDetailVO));
+ }
}
}
}
@@ -753,7 +955,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);
--
Gitblit v1.8.0