czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商品分类

Browse Source 
异常打印
This commit is contained in:
wangw
2024-03-07 18:27:35 +08:00
parent ee8f860b13
commit ebbf0ba08d
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbShopCategoryServiceImpl.java
View File

@@ -42,6 +42,7 @@ import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.stream.Collectors;
/**
* @website https://eladmin.vip
@@ -58,11 +59,8 @@ public class TbShopCategoryServiceImpl implements TbShopCategoryService {
@Override
public Map<String,Object> queryAll(TbShopCategoryQueryCriteria criteria, Pageable pageable){
// Page<TbShopCategory> page = tbShopCategoryRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), Sort.by("sort"));
Page<TbShopCategory> page = tbShopCategoryRepository.findAllBy(criteria.getShopId(), pageable);
// tbShopCategoryRepository.findAllBy(criteria.getShopId(),pageable);
List<Integer> treeId = new ArrayList<>();
for (TbShopCategory category : page.getContent()) {
@@ -88,8 +86,11 @@ public class TbShopCategoryServiceImpl implements TbShopCategoryService {
BeanUtils.copyProperties(category, tbShopCategoryDto);
dto.add(tbShopCategoryDto);
}
List<TbShopCategoryDto> result = dto.stream()
.filter(d -> d.getTree()==null || d.getId().equals(d.getTree()))
.collect(Collectors.toList());
return PageUtil.toPage(dto, dto.size());
return PageUtil.toPage(result, page.getTotalElements()-children.size());
}
@Override
@@ -111,7 +112,7 @@ public class TbShopCategoryServiceImpl implements TbShopCategoryService {
resources.setCreatedAt(Instant.now().toEpochMilli());
resources.setUpdatedAt(Instant.now().toEpochMilli());
TbShopCategory byName = tbShopCategoryRepository.findByName(resources.getName(), resources.getShopId());
if (byName.getName() != null){
if (byName != null){
throw new BadRequestException("分类名称重复");
}
if (resources.getPid() == null || "".equals(resources.getPid())){
@@ -119,7 +120,6 @@ public class TbShopCategoryServiceImpl implements TbShopCategoryService {
}else {
resources.setTree(Integer.valueOf(resources.getPid().trim()));
}
ValidationUtil.isNull(resources.getId(),"TbShopCategory","id",resources.getId());
return tbShopCategoryRepository.save(resources);
}