商品分组-时段 跨日的展示 次日

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductGroupServiceImpl.java

@@ -58,8 +58,11 @@ public class TbProductGroupServiceImpl implements TbProductGroupService {
         PageRequest sort = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), Sort.by("sort"));
         Page<TbProductGroup> page = tbProductGroupRepository.findAll((root, criteriaQuery, criteriaBuilder) ->
                 QueryHelp.getPredicate(root,criteria,criteriaBuilder),sort);
-
-        return PageUtil.toPage(page.map(tbProductGroupMapper::toDto));
+        Page<TbProductGroupDto> map = page.map(tbProductGroupMapper::toDto);
+        map.getContent().forEach(s->{
+            s.upSaleEndTime();
+        });
+        return PageUtil.toPage(map);
     }
 
     @Override