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

订单首页不展示 退单产生的 退单订单 只展示退单原订单

This commit is contained in:
wangw 2024-03-19 09:56:37 +08:00
parent 5e4b1859f5
commit 953fddd16a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
View File

@ -71,9 +71,8 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
// Page<TbOrderInfo> page = tbOrderInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
Page<TbOrderInfo> page = tbOrderInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> {
Predicate predicate = QueryHelp.getPredicate(root, criteria, criteriaBuilder);
// 追加校验参数 status为空且source为空 时 不查询状态为 "refund"且orderType为return 的
if (StringUtils.isBlank(criteria.getStatus()) && StringUtils.isBlank(criteria.getSource())) {
predicate = criteriaBuilder.and(predicate, criteriaBuilder.notEqual(root.get("status"), "refund"));
// 追加校验参数 status不为空 且 source不为空 不查询状态为 "refund" 的
if(StringUtils.isBlank(criteria.getStatus()) && StringUtils.isBlank(criteria.getSource())){
predicate = criteriaBuilder.and(predicate, criteriaBuilder.notEqual(root.get("orderType"), "return"));
}
return predicate;