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 @@ - - org.springframework.boot - spring-boot-starter-websocket - org.springframework.boot spring-boot-starter-web 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 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 @@ framework ${revision} + + + org.springframework.boot + spring-boot-starter-websocket + diff --git a/pom.xml b/pom.xml index 1d30464c..e4706366 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1 4.22.32.ALL 3.5.1 - 5.8.0 + 5.8.14 2.0.3.RELEASE 3.0.4 2.9.10