From 0c652eac6379cf686711974c6e7283fcd5787452 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Tue, 21 Mar 2023 14:39:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20hutool=20=E4=BE=9D=E8=B5=96=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0,=E4=BE=9D=E8=B5=96=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/pom.xml                                            | 4 ----
 .../lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java  | 5 ++---
 im-api/pom.xml                                               | 5 +++++
 pom.xml                                                      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/framework/pom.xml b/framework/pom.xml
index 3003fb45..c14cf371 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -51,10 +51,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
index 2cc364b1..c516b6c2 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
@@ -312,9 +312,8 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
         map.put("data", goodsSkuDetail);
 
         //获取分类
-        String[] split = goodsSkuDetail.getCategoryPath().split(",");
-        map.put("wholesaleList", wholesaleService.findByGoodsId(goodsSkuDetail.getGoodsId()));
-        map.put("categoryName", categoryService.getCategoryNameByIds(Arrays.asList(split)));
+        map.put("wholesaleList", GoodsSalesModeEnum.WHOLESALE.name().equals(goodsVO.getSalesModel()) ? wholesaleService.findByGoodsId(goodsSkuDetail.getGoodsId()) : Collections.emptyList());
+        map.put("categoryName", CharSequenceUtil.isNotEmpty(goodsIndex.getCategoryNamePath()) ? goodsIndex.getCategoryNamePath().split(",") : null);
 
         //获取规格信息
         map.put("specs", this.groupBySkuAndSpec(goodsVO.getSkuList()));
diff --git a/im-api/pom.xml b/im-api/pom.xml
index 7f823cf4..8f6efc47 100644
--- a/im-api/pom.xml
+++ b/im-api/pom.xml
@@ -19,6 +19,11 @@
             <artifactId>framework</artifactId>
             <version>${revision}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 1d30464c..e4706366 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
         <images-version>1</images-version>
         <alipay-sdk-version>4.22.32.ALL</alipay-sdk-version>
         <mybatis-plus-version>3.5.1</mybatis-plus-version>
-        <Hutool-version>5.8.0</Hutool-version>
+        <Hutool-version>5.8.14</Hutool-version>
         <TinyPinyin-verions>2.0.3.RELEASE</TinyPinyin-verions>
         <jasypt-version>3.0.4</jasypt-version>
         <neetl-version>2.9.10</neetl-version>