From 2250bda5c17ac787235e35e6264161146769bc0c Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sat, 17 Aug 2024 14:38:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E6=97=B6=E9=97=B4=E7=AE=A1?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/dto/product/TbProductGroupDto.java | 11 ----------- .../impl/productimpl/TbProductGroupServiceImpl.java | 6 +----- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductGroupDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductGroupDto.java index 3c6d5e75..5bb4eeba 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductGroupDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductGroupDto.java @@ -54,15 +54,4 @@ public class TbProductGroupDto implements Serializable { private String saleStartTime; private String saleEndTime; - - public void upSaleEndTime() { - if (useTime != null && useTime == 1) { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm"); - LocalTime startTime = LocalTime.parse(saleStartTime, formatter); - LocalTime endTime = LocalTime.parse(saleEndTime, formatter); - if (endTime.isBefore(startTime)) { - saleEndTime = "次日 " + saleEndTime; - } - } - } } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductGroupServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductGroupServiceImpl.java index 0b4215bd..93efc746 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductGroupServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductGroupServiceImpl.java @@ -58,11 +58,7 @@ public class TbProductGroupServiceImpl implements TbProductGroupService { PageRequest sort = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), Sort.by("sort")); Page page = tbProductGroupRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),sort); - Page map = page.map(tbProductGroupMapper::toDto); - map.getContent().forEach(s->{ - s.upSaleEndTime(); - }); - return PageUtil.toPage(map); + return PageUtil.toPage(page.map(tbProductGroupMapper::toDto)); } @Override