From 70ebe043e6b62756be9e257fe954c747d46568b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 16 九月 2022 19:00:59 +0800
Subject: [PATCH] 商品ID字符串化

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |   40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 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 0715f2c..f4981a7 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
@@ -1731,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());
@@ -2362,18 +2366,18 @@
     }
 
     /**
-     * @author hxh 
+     * @return org.springframework.data.mongodb.core.query.Criteria
+     * @author hxh
      * @description 鑾峰彇mongodb鍟嗗搧ID鐩稿悓鐨勬潯浠�
      * @date 16:05 2022/8/24
      * @param: key
      * @param: auctionId
-     * @return org.springframework.data.mongodb.core.query.Criteria
      **/
     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 Criteria.where(key).regex("-" + getAuctionId(auctionId));
         }
     }
 
@@ -2390,9 +2394,35 @@
         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);
+        }
     }
 
 }

--
Gitblit v1.8.0