|
|
@@ -1636,7 +1636,7 @@ public class KwpGoodsService {
|
|
|
public GoodsDetails getDetails(Long id) {
|
|
|
KwpGoods goods = kwpGoodsMapper.selectById(id);
|
|
|
if (Objects.isNull(goods)) {
|
|
|
- throw new BusinessException("当前商品不存在!");
|
|
|
+ return null;
|
|
|
}
|
|
|
GoodsDetails detail = BeanUtils.copyProperties(goods, GoodsDetails.class);
|
|
|
|
|
|
@@ -1657,11 +1657,6 @@ public class KwpGoodsService {
|
|
|
goodsStatusMap = dict.get(DictTypeEnum.GOODS_STATUS.getType());
|
|
|
goodsSpecMap = dict.get(DictTypeEnum.GOODS_SPEC.getType());
|
|
|
}
|
|
|
- List<SysDictResDto> types = remoteSystemService.queryDictFrontAll(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), detail.getGoodsType());
|
|
|
- if (CollectionUtils.isNotEmpty(types)) {
|
|
|
- detail.setGoodsTypes(types.stream().map(SysDictResDto::getValue).toList())
|
|
|
- .setGoodsTypeLabels(String.join(Global.RIGHT_SLASH, types.stream().map(SysDictResDto::getLabel).toList()));
|
|
|
- }
|
|
|
detail.setGoodsTypeLabel(CollectionUtils.isNotEmpty(productNameMap) ? productNameMap.get(detail.getGoodsType()) : null)
|
|
|
.setUnitLabel(CollectionUtils.isNotEmpty(unitMap) ? unitMap.get(detail.getUnit()) : null)
|
|
|
.setStatusLabel(CollectionUtils.isNotEmpty(goodsStatusMap) ? goodsStatusMap.get(String.valueOf(detail.getStatus())) : null)
|