|
|
@@ -1255,7 +1255,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
|
|
|
List<PcProductVo> pcProductVos = BeanUtil.copyToList(productBaseVos, PcProductVo.class);
|
|
|
int size = productBaseVos.size();
|
|
|
if (size > pageQuery.getPageSize()) {
|
|
|
- productBaseVos.remove(productBaseVos.size() - 1);
|
|
|
+ pcProductVos.remove(pcProductVos.size() - 1);
|
|
|
}
|
|
|
TableDataInfo<ProductBaseVo> tableDataInfo = TableDataInfo.build(productBaseVos);
|
|
|
tableDataInfo.setTotal(size);
|
|
|
@@ -1285,13 +1285,13 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
|
|
|
List<ProductBaseVo> productBaseVos = baseMapper.selectAllList(lqw);
|
|
|
if (CollUtil.isNotEmpty(productBaseVos)) {
|
|
|
List<PcProductVo> pcProductVos = BeanUtil.copyToList(productBaseVos, PcProductVo.class);
|
|
|
- int size = productBaseVos.size();
|
|
|
+ int size = pcProductVos.size();
|
|
|
if (size > pageQuery.getPageSize()) {
|
|
|
- productBaseVos.remove(productBaseVos.size() - 1);
|
|
|
+ pcProductVos.remove(pcProductVos.size() - 1);
|
|
|
}
|
|
|
- TableDataInfo<ProductBaseVo> tableDataInfo = TableDataInfo.build(productBaseVos);
|
|
|
+ TableDataInfo<PcProductVo> tableDataInfo = TableDataInfo.build(pcProductVos);
|
|
|
tableDataInfo.setTotal(size);
|
|
|
- return TableDataInfo.build(pcProductVos);
|
|
|
+ return tableDataInfo;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1325,13 +1325,13 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
|
|
|
|
|
|
// productBaseVos.forEach(vo -> {
|
|
|
// });
|
|
|
- int size = productBaseVos.size();
|
|
|
+ int size = pcProductVos.size();
|
|
|
if (size > pageQuery.getPageSize()) {
|
|
|
- productBaseVos.remove(productBaseVos.size() - 1);
|
|
|
+ pcProductVos.remove(pcProductVos.size() - 1);
|
|
|
}
|
|
|
- TableDataInfo<ProductBaseVo> tableDataInfo = TableDataInfo.build(productBaseVos);
|
|
|
+ TableDataInfo<PcProductVo> tableDataInfo = TableDataInfo.build(pcProductVos);
|
|
|
tableDataInfo.setTotal( size);
|
|
|
- return TableDataInfo.build(pcProductVos);
|
|
|
+ return tableDataInfo;
|
|
|
}
|
|
|
}
|
|
|
return TableDataInfo.build();
|
|
|
@@ -1372,11 +1372,13 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
|
|
|
* @param pageQuery
|
|
|
*/
|
|
|
@Override
|
|
|
- public TableDataInfo<PcProductVo> getProductShoppingCartPage(Long[] ids,Long userId, PageQuery pageQuery) {
|
|
|
- Page<ProductShoppingCart> productShoppingCartPage = productShoppingCartMapper.selectPage(pageQuery.build(), Wrappers.lambdaQuery(ProductShoppingCart.class)
|
|
|
- .eq(ProductShoppingCart::getUserId, userId)
|
|
|
- .in(ids != null && ids.length > 0, ProductShoppingCart::getId, ids)
|
|
|
- );
|
|
|
+ public TableDataInfo<PcProductVo> getProductShoppingCartPage(String id,Long userId, PageQuery pageQuery) {
|
|
|
+ LambdaQueryWrapper<ProductShoppingCart> lqw = Wrappers.lambdaQuery(ProductShoppingCart.class);
|
|
|
+ lqw.eq(ProductShoppingCart::getUserId, userId);
|
|
|
+ if (ObjectUtil.isNotEmpty(id)) {
|
|
|
+ lqw.eq(ProductShoppingCart::getId, id.split(","));
|
|
|
+ }
|
|
|
+ Page<ProductShoppingCart> productShoppingCartPage = productShoppingCartMapper.selectPage(pageQuery.build(), lqw);
|
|
|
if (CollUtil.isNotEmpty(productShoppingCartPage.getRecords())) {
|
|
|
List<PcProductVo> productVos = new ArrayList<>();
|
|
|
for (ProductShoppingCart productShoppingCart : productShoppingCartPage.getRecords()) {
|