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 | 147 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 126 insertions(+), 21 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 fe2098a..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
@@ -16,12 +16,14 @@
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;
@@ -52,6 +54,7 @@
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;
@@ -176,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);
@@ -231,15 +235,34 @@
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);
+ // 楂樼骇鎺ュ彛 -- 淇℃伅鏇村畬鏁�
+ 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);
@@ -253,48 +276,57 @@
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());
+ }
+ }
}
}
}
}
-
+
if (tb == null && commonGoods == null) {
out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
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())) {
+
+ 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 (tb != null) {
@@ -310,7 +342,7 @@
}
commonGoods = CommonGoodsFactory.create(goodsBrief);
}
-
+
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
@@ -353,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);
@@ -366,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());
@@ -549,7 +650,8 @@
* @param endprice
* @return
*/
- private void searchTaoBaoGoods(AcceptData acceptData, 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);
@@ -650,7 +752,8 @@
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()))) {
+ || ("android".equalsIgnoreCase(platform)
+ && VersionUtil.greaterThan_2_0_1(platform, acceptData.getVersion()))) {
BrandInfoVO brandInfoVO = new BrandInfoVO();
brandInfoVO.setId(taoBaoShop.getId());
brandInfoVO.setName(taoBaoShop.getShopName());
@@ -676,7 +779,8 @@
* @param endprice
* @return
*/
- private void searchJDGoods(AcceptData acceptData, 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;
@@ -851,7 +955,8 @@
* @param endprice
* @return
*/
- private void searchPDDGoods(AcceptData acceptData, 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