From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 108 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index 0ada8ba..34f2680 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -34,6 +34,7 @@
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.stereotype.Component;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.NodeList;
@@ -207,7 +208,7 @@
for (String c : filter.getCateIds().split(","))
cateList.add(Long.parseLong(c));
}
- return TaoKeApiUtil.searchWuLiao(filter, specialId, relationId);
+ return TaoKeApiUtil.searchWuLiaoNew(filter, specialId, relationId);
}
/**
@@ -495,7 +496,7 @@
}
if (1 > 0)
- return TaoKeApiUtil.searchWuLiao(filter, null, null);
+ return TaoKeApiUtil.searchWuLiaoNew(filter, null, null);
Map<String, String> params = new HashMap<String, String>();
String key = filter.getKey();
@@ -1730,7 +1731,11 @@
*/
public static TaoBaoGoodsBrief convert(CommonGoods commonGoods) {
TaoBaoGoodsBrief taoBaoGoods = new TaoBaoGoodsBrief();
- taoBaoGoods.setAuctionId(commonGoods.getGoodsId());
+ if(!StringUtil.isNullOrEmpty(commonGoods.getGoodsSign())) {
+ taoBaoGoods.setAuctionId(commonGoods.getGoodsSign());
+ }else{
+ taoBaoGoods.setAuctionId(commonGoods.getGoodsId());
+ }
taoBaoGoods.setBiz30day(commonGoods.getSales());
taoBaoGoods.setCouponAmount(commonGoods.getCouponAmount());
taoBaoGoods.setCouponInfo(commonGoods.getCouponInfo());
@@ -2236,7 +2241,11 @@
if (StringUtil.isNullOrEmpty(relationId))
return url;
if (!url.contains("&relationId="))
- return url + "&relationId=" + relationId;
+ if(url.contains("?")) {
+ return url + "&relationId=" + relationId;
+ }else{
+ return url + "?relationId=" + relationId;
+ }
else
return url;
}
@@ -2323,15 +2332,108 @@
return false;
}
- public static boolean isEqual(String auctionId1,String auctionId2){
+ /**
+ * @return boolean
+ * @author hxh
+ * @description 鍒ゆ柇娣樺疂鍟嗗搧ID鏄惁鐩哥瓑
+ * @date 14:55 2022/8/24
+ * @param: auctionId1
+ * @param: auctionId2
+ **/
+ public static boolean isEqual(String auctionId1, String auctionId2) {
+ if (auctionId1 == null || auctionId2 == null) {
+ return false;
+ }
+ if (auctionId1.indexOf("-") > 0 && auctionId2.indexOf("-") > 0) {
+ return auctionId1.split("-")[1].equals(auctionId2.split("-")[1]);
+ }
return auctionId1.equals(auctionId2);
+ }
+ /**
+ * @return java.lang.String
+ * @author hxh
+ * @description 鑾峰彇鍟嗗搧ID鐨勫悗鍗婃
+ * @date 15:20 2022/8/24
+ * @param: auctionId
+ **/
+ public static String getAuctionId(String auctionId) {
+ if (auctionId == null)
+ return auctionId;
+ if (auctionId.indexOf("-") > 0) {
+ return auctionId.split("-")[1];
+ } else {
+ return auctionId;
+ }
+
+ }
+
+ /**
+ * @return org.springframework.data.mongodb.core.query.Criteria
+ * @author hxh
+ * @description 鑾峰彇mongodb鍟嗗搧ID鐩稿悓鐨勬潯浠�
+ * @date 16:05 2022/8/24
+ * @param: key
+ * @param: auctionId
+ **/
+ public static Criteria getAuctionIdEqualCriteria(String key, String auctionId) {
+ if (!isNewAuctionId(auctionId)) {
+ return Criteria.where(key).is(auctionId);
+ } else {
+ return Criteria.where(key).regex("-" + getAuctionId(auctionId));
+ }
+ }
+
+ /**
+ * @return boolean
+ * @author hxh
+ * @description 鏄惁涓烘柊鐨勫晢鍝両D
+ * @date 15:39 2022/8/24
+ * @param: auctionId
+ **/
+ public static boolean isNewAuctionId(String auctionId) {
+ if (auctionId != null && auctionId.indexOf("-") > 0)
+ return true;
+ return false;
+ }
+
+ /**
+ * @return java.lang.String
+ * @author hxh
+ * @description 鑾峰彇娣樺疂鐨勫晢鍝佹爣棰�
+ * @date 11:36 2022/9/9
+ **/
+ public static String getGoodsTitleFromTokenText(String text) {
+ String reg = "銆�.*銆�";
+ Pattern p = Pattern.compile(reg);
+ Matcher matcher = p.matcher(text);
+ if (matcher.find()) {
+ String title = matcher.group();
+ if(title!=null&&title.length()>0) {
+ return title.replace("銆�","").replace("銆�","");
+ }
+ }
+ return null;
}
public static void main(String[] args) {
- System.out.println(isHaveNewVersionTaoBaoToken("寰╄嚦\uD83D\uDC8B9.0鈧猻DO0X7l3Twm鈧�/ 鍘籺谩o瀵舵姠"));
+// String reg = "銆�.*銆�";
+// Pattern p = Pattern.compile(reg);
+// Matcher matcher = p.matcher("銆愭窐瀹濄�慼ttps://m.tb.cn/h.Ub3d7Kb?tk=g2Az2EmdcIX CZ3457 銆岄�犳ⅵ銆愯敺钖囧皯濂炽�戝鍙ょ鑺辩墰濂剁粧缇婄緮缁掓瘺姣鍐繚鏆栦紤闂叉娌欏彂姣�峔n" +
+// "鐐瑰嚮閾炬帴鐩存帴鎵撳紑");
+// if (matcher.find()) {
+// String title = matcher.group();
+// System.out.println(title);
+// }
+ String relationId = "1222";
+ String url="http://123id=123";
+ if(url.contains("?")) {
+ System.out.println(url + "&relationId=" + relationId);
+ }else{
+ System.out.println(url + "?relationId=" + relationId);
+ }
}
}
--
Gitblit v1.8.0