From 241022582cb3ed86b087cdbef4dd74c40ae35958 Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Sat, 21 Jun 2025 14:11:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=9A=84=E6=8B=BC=E9=9F=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/service/impl/ShopBaseProductBrandServiceImpl.java  | 1 -
 .../service/impl/ShopPlantformSubsiteServiceImpl.java       | 6 +++---
 .../user/service/impl/ShopUserSearchHistoryServiceImpl.java | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductBrandServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductBrandServiceImpl.java
index a27bf765..bc2db4be 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductBrandServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductBrandServiceImpl.java
@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.pinyin.PinyinUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.suisung.mall.common.domain.UserDto;
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/plantform/service/impl/ShopPlantformSubsiteServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/plantform/service/impl/ShopPlantformSubsiteServiceImpl.java
index 0766f4fe..ba726296 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/plantform/service/impl/ShopPlantformSubsiteServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/plantform/service/impl/ShopPlantformSubsiteServiceImpl.java
@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.pinyin.PinyinUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.suisung.mall.common.api.CommonResult;
@@ -18,6 +17,7 @@ import com.suisung.mall.common.modules.plantform.ShopPlantformSubsite;
 import com.suisung.mall.common.modules.plantform.ShopPlantformSubsiteUser;
 import com.suisung.mall.common.utils.CheckUtil;
 import com.suisung.mall.common.utils.I18nUtil;
+import com.suisung.mall.common.utils.TinyPinyinUtils;
 import com.suisung.mall.core.web.service.impl.BaseServiceImpl;
 import com.suisung.mall.shop.base.service.AccountBaseConfigService;
 import com.suisung.mall.shop.plantform.mapper.ShopPlantformSubsiteMapper;
@@ -268,8 +268,8 @@ public class ShopPlantformSubsiteServiceImpl extends BaseServiceImpl<ShopPlantfo
             // 处理索引
             String subsite_name = Convert.toStr(subsite_row.get("subsite_name"));
             if (StrUtil.isNotBlank(subsite_name)) {
-                String pinyin_subsite_name = PinyinUtil.getPinyin(subsite_name);
-                Character letter = PinyinUtil.getPinyin(pinyin_subsite_name).toUpperCase().charAt(0);
+                String pinyin_subsite_name = TinyPinyinUtils.getFullPinyin(subsite_name);
+                Character letter = TinyPinyinUtils.getFullPinyin(pinyin_subsite_name).toUpperCase().charAt(0);
 
                 List<Map> tmp_row_list = (List<Map>) ObjectUtil.defaultIfNull(subsite_index_rows.get(letter), new ArrayList<>());
                 if (CollUtil.isEmpty(tmp_row_list)) {
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserSearchHistoryServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserSearchHistoryServiceImpl.java
index c3dd2e46..d5b20567 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserSearchHistoryServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserSearchHistoryServiceImpl.java
@@ -6,7 +6,6 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
-import cn.hutool.extra.pinyin.PinyinUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -17,6 +16,7 @@ import com.suisung.mall.common.exception.ApiUserException;
 import com.suisung.mall.common.modules.user.ShopUserSearchHistory;
 import com.suisung.mall.common.utils.CheckUtil;
 import com.suisung.mall.common.utils.I18nUtil;
+import com.suisung.mall.common.utils.TinyPinyinUtils;
 import com.suisung.mall.core.web.service.impl.BaseServiceImpl;
 import com.suisung.mall.shop.base.service.AccountBaseConfigService;
 import com.suisung.mall.shop.user.mapper.ShopUserSearchHistoryMapper;
@@ -75,7 +75,7 @@ public class ShopUserSearchHistoryServiceImpl extends BaseServiceImpl<ShopUserSe
                 searchHistory = new ShopUserSearchHistory();
                 searchHistory.setSearch_id(search_id);
                 searchHistory.setSearch_keyword(search_keyword);
-                searchHistory.setSearch_char_index(PinyinUtil.getPinyin(search_keyword));
+                searchHistory.setSearch_char_index(TinyPinyinUtils.getFullPinyin(search_keyword));
                 searchHistory.setSearch_nums(1);
                 searchHistory.setUser_id(user_id);
             }