|
|
@@ -31,7 +31,7 @@ import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
- * @desc: 商品service
|
|
|
+ * @desc: 商品service TODO
|
|
|
* @author: yzc
|
|
|
* @date: 2023-06-25 14:47
|
|
|
*/
|
|
|
@@ -470,9 +470,16 @@ public class KwpGoodsService {
|
|
|
* @return: java.util.List<com.sckw.product.model.vo.res.BuildingMaterialsMarketList>
|
|
|
*/
|
|
|
public List<BuildingMaterialsMarketList> buildingMaterialsMarketList(BuildingMaterialsMarketListParam params) {
|
|
|
-
|
|
|
-
|
|
|
- return null;
|
|
|
+ List<Long> typeIds = params.getCategoryIds();
|
|
|
+ LambdaQueryWrapper<KwpGoods> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ wrapper.like(StringUtils.isNotBlank(params.getKeywords()), KwpGoods::getName, params.getKeywords())
|
|
|
+ .in(CollectionUtils.isNotEmpty(typeIds), KwpGoods::getTypeId, typeIds)
|
|
|
+ .in(CollectionUtils.isNotEmpty(params.getIndustryIds()), KwpGoods::getIndustryId, params.getIndustryIds())
|
|
|
+ .in(CollectionUtils.isNotEmpty(params.getTradings()), KwpGoods::getTypeId, params.getTradings())
|
|
|
+ .eq(KwpGoods::getStatus, GoodsStatusEnum.PUT_ON_SHELVES.getCode()).eq(KwpGoods::getDelFlag, Global.NO);
|
|
|
+ List<KwpGoods> list = kwpGoodsMapper.selectList(wrapper);
|
|
|
+ List<BuildingMaterialsMarketList> result = BeanUtils.copyToList(list, BuildingMaterialsMarketList.class);
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -485,7 +492,7 @@ public class KwpGoodsService {
|
|
|
*/
|
|
|
public List<GoodsDropList> dropList(GoodsDropListReq params) {
|
|
|
LambdaQueryWrapper<KwpGoods> wrapper = new LambdaQueryWrapper<>();
|
|
|
- wrapper.like(StringUtils.isNotBlank(params.getName()),KwpGoods::getName, params.getName())
|
|
|
+ wrapper.like(StringUtils.isNotBlank(params.getName()), KwpGoods::getName, params.getName())
|
|
|
.eq(KwpGoods::getStatus, GoodsStatusEnum.PUT_ON_SHELVES.getCode())
|
|
|
.eq(KwpGoods::getDelFlag, Global.NO).orderByDesc(KwpGoods::getAddedTime);
|
|
|
List<KwpGoods> list = kwpGoodsMapper.selectList(wrapper);
|
|
|
@@ -493,7 +500,7 @@ public class KwpGoodsService {
|
|
|
return Collections.emptyList();
|
|
|
}
|
|
|
List<GoodsDropList> result = new ArrayList<>();
|
|
|
- list.forEach(e->{
|
|
|
+ list.forEach(e -> {
|
|
|
GoodsDropList goodsDropList = BeanUtils.copyProperties(e, GoodsDropList.class);
|
|
|
goodsDropList.setSupplyEnt("供应企业");
|
|
|
result.add(goodsDropList);
|