首页商品查询

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/SupplierItemDaoImpl.java

@@ -94,7 +94,8 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
         if (StringUtils.hasLength(dto.getName())) {
             criteria.andNameLike("%" + dto.getName() + "%");
         }
-        JdbcHelper.ifPresent(dto.getType(), criteria::andTypeEqualTo);
+        JdbcHelper.ifPresent(dto.getTypeList(), criteria::andTypeIn);
+    //    JdbcHelper.ifPresent(dto.getType(), criteria::andTypeEqualTo);
         JdbcHelper.ifPresent(dto.getFilterType(), criteria::andTypeNotIn);
         JdbcHelper.ifPresent(dto.getStock(), criteria::andStockGreaterThan);
         JdbcHelper.ifPresent(dto.getIsOnSale(), criteria::andIsOnSaleEqualTo);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java

@@ -237,6 +237,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             }
             //只需要从剩下的符合条件的数据中查询出20条随机数据，无需按照前端页码获取数据
             dto.setPage(1);
+            dto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.COLLECT.getCode(), DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()));
             List<SupplierItem> supplierItemList = supplierItemDao.findListForRandomSort(dto);
             PageInfo pageInfo = new PageInfo(supplierItemList);
             List<Long> filterItemIds = supplierItemList.stream().map(SupplierItem::getId).collect(Collectors.toList());