From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java
index 47c4f3b..d025f1d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java
@@ -17,6 +17,8 @@
import com.yeshi.fanli.dto.douyin.DouYinGoods;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.dto.suning.SuningGoodsInfo;
+import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -38,7 +40,11 @@
import com.yeshi.fanli.util.jd.JDUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
+import com.yeshi.fanli.util.suning.SuningApiUtil;
+import com.yeshi.fanli.util.suning.SuningUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
+import com.yeshi.fanli.util.vipshop.VipShopApiUtil;
+import com.yeshi.fanli.util.vipshop.VipShopUtil;
import com.yeshi.fanli.vo.msg.TokenVO;
import com.yeshi.fanli.vo.search.GoodsDocParseResultVO;
@@ -205,7 +211,6 @@
link = urlList.get(0);
else// 绗竴涓彛浠ゅ湪绗竴涓摼鎺ュ墠闈�
token = tokenList.get(0);
-
} else if (typeSet.contains(ClipboardContentType.link) && typeSet.contains(ClipboardContentType.text)) {// 閾炬帴+鏂囨湰
link = urlList.get(0);
@@ -216,7 +221,17 @@
if (!StringUtil.isNullOrEmpty(link)) {
CommonGoods goods = parseLink(urlList.get(0));
if (goods == null || goods.getGoodsId() == null) {
- if (urlList.size() > 1)
+ if (tokenList.size() == 0 && urlList.size() == 2
+ && urlList.get(0).indexOf("://uland.taobao.com") > -1
+ && urlList.get(1).indexOf("?id=") > -1) {// 鏈�2涓摼鎺ョ殑鏂囨,绗竴涓槸搴楅摵鍒搁摼鎺ワ紝鍏朵腑浜屼釜鏄窐瀹濆晢鍝佽鎯�
+ CommonGoods goods1 = parseLink(urlList.get(1));
+ if (goods1 != null && goods1.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
+ resultListener.onResult(goods1);
+ } else {
+ resultListener.onResult(new GoodsDocParseResultVO(text, urlList.get(0)));
+ }
+
+ } else if (urlList.size() > 1)
resultListener.onResult(new GoodsDocParseResultVO(text, urlList.get(0)));
else {// 鍗曢摼鎺�
// 鍒ゆ柇鏄惁鍖呭惈鍙浆閾剧殑閾炬帴
@@ -388,6 +403,17 @@
commonGoods.setPicture(goods.getGoodsThumbnailUrl());
}
}
+ } else if (simpleGoods.getGoodsType() == Constant.SOURCE_TYPE_VIP) {
+ VIPGoodsInfo goods = VipShopApiUtil.getGoodsDetail(simpleGoods.getGoodsId());
+ if (goods != null) {
+ commonGoods = CommonGoodsFactory.create(goods);
+ }
+ } else if (simpleGoods.getGoodsType() == Constant.SOURCE_TYPE_SUNING) {
+ SuningGoodsInfo goods = SuningApiUtil.getGoodsDetail(simpleGoods.getGoodsId().split("-")[1],
+ simpleGoods.getGoodsId().split("-")[0]);
+ if (goods != null) {
+ commonGoods = CommonGoodsFactory.create(goods);
+ }
}
return commonGoods;
@@ -411,6 +437,19 @@
if (!StringUtil.isNullOrEmpty(pddId)) {
return new SimpleCommonGoods(pddId, Constant.SOURCE_TYPE_PDD);
}
+
+ // 瑙ｆ瀽鑻忓畞
+ String suningId = SuningUtil.parseGoodsIdByUrl(link);
+ if (!StringUtil.isNullOrEmpty(suningId)) {
+ return new SimpleCommonGoods(suningId, Constant.SOURCE_TYPE_SUNING);
+ }
+
+ // 瑙ｆ瀽鍞搧浼�
+ String vipId = VipShopUtil.parseGoodsIdByUrl(link);
+ if (!StringUtil.isNullOrEmpty(vipId)) {
+ return new SimpleCommonGoods(vipId, Constant.SOURCE_TYPE_VIP);
+ }
+
// 瑙ｆ瀽娣樺疂
String auctionId = parseTBAuctionIdFromLink(link);
if (!StringUtil.isNullOrEmpty(auctionId)) {
@@ -469,7 +508,7 @@
tb = TaoBaoUtil.parsePhoneShareUrlByTM(link);
if (tb != null)
auctionId = tb.getAuctionId() + "";
- } else if (link.contains("h5.m.taobao") || link.contains("detail.m.tmall")|| link.contains("item.taobao")
+ } else if (link.contains("h5.m.taobao") || link.contains("detail.m.tmall") || link.contains("item.taobao")
|| link.contains("detail.tmall")) { // 鎵嬫満椤甸潰鍜岀數鑴戦〉闈�
Map<String, String> map = Utils.parseURL(link);
String id = "";
--
Gitblit v1.8.0