github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

订单状态

pull/451/head
starrysky 2020-05-17 15:21:19 +08:00
parent 8e5da13518
commit 035ce37565
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java
View File

@ -143,6 +143,9 @@ public class CustomerOrderServiceImpl implements CustomerOrderService {
customerOrderDTO.setCustomerOrderProductList(customerOrderProductDTOList); customerOrderDTO.setCustomerOrderProductList(customerOrderProductDTOList);
String procStatus = customerOrderDTO.getProcStatus(); String procStatus = customerOrderDTO.getProcStatus();
ProcStatusEnum procStatusEnum = ProcStatusEnum.getProcStatusEnum(procStatus); ProcStatusEnum procStatusEnum = ProcStatusEnum.getProcStatusEnum(procStatus);
if(null == procStatusEnum){
procStatusEnum = ProcStatusEnum.WAIT_SEND_GOOD;
}
if(null != procStatusEnum){ if(null != procStatusEnum){
customerOrderDTO.setProcStatusName(procStatusEnum.getName()); customerOrderDTO.setProcStatusName(procStatusEnum.getName());
} }

6
eladmin-system/src/main/java/me/zhengjie/modules/wms/sr/productCount/service/impl/ProductCountServiceImpl.java
View File

@ -62,8 +62,8 @@ public class ProductCountServiceImpl implements ProductCountService {
List<Predicate> targetPredicateList = new ArrayList<>(); List<Predicate> targetPredicateList = new ArrayList<>();
Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); // Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1);
targetPredicateList.add(statusPredicate); // targetPredicateList.add(statusPredicate);
if(!StringUtils.isEmpty(criteria.getProductName())){ if(!StringUtils.isEmpty(criteria.getProductName())){
@ -91,7 +91,7 @@ public class ProductCountServiceImpl implements ProductCountService {
} }
}; };
Page<ProductCount> page = productCountRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); Page<ProductCount> page = productCountRepository.findAll(specification, pageable);
return PageUtil.toPage(page.map(productCountMapper::toDto)); return PageUtil.toPage(page.map(productCountMapper::toDto));
} }