|
@@ -95,16 +95,13 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
|
|
|
SkuQueryVOS = baseMapper.selectGoodsSkuInfoByStore(goodsSkuDTO);
|
|
|
}
|
|
|
|
|
|
- List<GoodsSkuSpec> skuStoreList = goodsSkuSpecMapper.selectList(
|
|
|
- new QueryWrapper<GoodsSkuSpec>().lambda()
|
|
|
- .eq(GoodsSkuSpec::getGoodsSkuId, id)
|
|
|
- .eq(GoodsSkuSpec::getDelFlag, DeleteStatus.OK.getCode()));
|
|
|
-
|
|
|
if (CollUtil.isEmpty(SkuQueryVOS)) {
|
|
|
return new GoodsSkuQueryVO();
|
|
|
}
|
|
|
GoodsSkuQueryVO goodsSkuQueryVO = SkuQueryVOS.get(0);
|
|
|
- goodsSkuQueryVO.setSpecVoList(skuStoreList);
|
|
|
+ if (StringUtils.isNotBlank(goodsSkuQueryVO.getSpecs())) {
|
|
|
+ goodsSkuQueryVO.setSpecValLists(JSONUtil.toList(JSONUtil.parseArray(goodsSkuQueryVO.getSpecs()), String.class));
|
|
|
+ }
|
|
|
return goodsSkuQueryVO;
|
|
|
}
|
|
|
|
|
@@ -152,17 +149,6 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
|
|
|
goodsSku_.setSpecValLists(JSONUtil.toList(JSONUtil.parseArray(goodsSku_.getSpecs()), String.class));
|
|
|
}
|
|
|
});
|
|
|
- Set<Long> collect = SkuQueryVOS.stream().map(GoodsSkuQueryVO::getId).collect(Collectors.toSet());
|
|
|
- List<GoodsSkuSpec> skuStoreList = goodsSkuSpecMapper.selectList(
|
|
|
- new QueryWrapper<GoodsSkuSpec>().lambda()
|
|
|
- .in(GoodsSkuSpec::getGoodsSkuId, collect)
|
|
|
- .eq(GoodsSkuSpec::getDelFlag, DeleteStatus.OK.getCode()));
|
|
|
- if (CollUtil.isNotEmpty(skuStoreList)) {
|
|
|
- Map<Long, List<GoodsSkuSpec>> map = skuStoreList.stream().collect(Collectors.groupingBy(GoodsSkuSpec::getGoodsSkuId));
|
|
|
- SkuQueryVOS.forEach(sku -> {
|
|
|
- sku.setSpecVoList(map.get(sku.getId()));
|
|
|
- });
|
|
|
- }
|
|
|
return SkuQueryVOS;
|
|
|
}
|
|
|
|
|
@@ -388,17 +374,13 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
|
|
|
if (CollUtil.isEmpty(SkuQueryVOS)) {
|
|
|
return SkuQueryVOS;
|
|
|
}
|
|
|
- Set<Long> collect = SkuQueryVOS.stream().map(GoodsSkuQueryVO::getId).collect(Collectors.toSet());
|
|
|
- List<GoodsSkuSpec> skuStoreList = goodsSkuSpecMapper.selectList(
|
|
|
- new QueryWrapper<GoodsSkuSpec>().lambda()
|
|
|
- .in(GoodsSkuSpec::getGoodsSkuId, collect)
|
|
|
- .eq(GoodsSkuSpec::getDelFlag, DeleteStatus.OK.getCode()));
|
|
|
- if (CollUtil.isNotEmpty(skuStoreList)) {
|
|
|
- Map<Long, List<GoodsSkuSpec>> map = skuStoreList.stream().collect(Collectors.groupingBy(GoodsSkuSpec::getGoodsSkuId));
|
|
|
- SkuQueryVOS.forEach(sku -> {
|
|
|
- sku.setSpecVoList(map.get(sku.getId()));
|
|
|
- });
|
|
|
- }
|
|
|
+ // 设置规格值
|
|
|
+ SkuQueryVOS.forEach(goodsSku_ -> {
|
|
|
+ //values字符串数组转List
|
|
|
+ if (StringUtils.isNotBlank(goodsSku_.getSpecs())) {
|
|
|
+ goodsSku_.setSpecValLists(JSONUtil.toList(JSONUtil.parseArray(goodsSku_.getSpecs()), String.class));
|
|
|
+ }
|
|
|
+ });
|
|
|
return SkuQueryVOS;
|
|
|
}
|
|
|
|