From f42257ece527af5b2c3989c7cc905d8919f6b1c4 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 14 Mar 2024 13:42:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=88=86=E9=A1=B5=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=20=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=20=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=B1=BB=E5=9E=8B=E4=B8=BA0=E6=97=B6=20=E8=AF=A5?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=BD=AE=E4=B8=BA=E7=A9=BA=E5=80=BC=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=20=E4=BC=A0=E5=8F=82?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/order/TbOrderInfoController.java | 4 ++-- .../cashier/dto/order/TbOrderInfoQueryCriteria.java | 7 +++++++ .../main/java/cn/ysk/cashier/pojo/shop/TbShopUser.java | 4 ++-- .../service/impl/order/TbOrderInfoServiceImpl.java | 10 +++++++++- .../ysk/cashier/service/order/TbOrderInfoService.java | 3 +-- .../src/main/resources/config/application.yml | 3 +++ 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java index d317ca4b..a229fbe7 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java @@ -57,8 +57,8 @@ public class TbOrderInfoController { @PostMapping("/date") @Log("查询订单") @ApiOperation("查询订单") - public ResponseEntity queryTbOrderInfo(@RequestBody TbOrderInfoQueryCriteria criteria, Pageable pageable){ - return new ResponseEntity<>(tbOrderInfoService.queryAll(criteria,pageable),HttpStatus.OK); + public ResponseEntity queryTbOrderInfo(@RequestBody TbOrderInfoQueryCriteria criteria){ + return new ResponseEntity<>(tbOrderInfoService.queryAllPage(criteria),HttpStatus.OK); } @GetMapping("/payCount") diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoQueryCriteria.java index 978236d6..9911eb9f 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoQueryCriteria.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoQueryCriteria.java @@ -55,6 +55,13 @@ public class TbOrderInfoQueryCriteria{ /** 精确 */ @Query private String shopId; + + private Integer pageSize; + + private Integer page; + + private String sort; + /** BETWEEN */ @Query(type = Query.Type.BETWEEN) private List createdAt; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopUser.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopUser.java index a1a09138..eedd7118 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopUser.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopUser.java @@ -142,11 +142,11 @@ public class TbShopUser implements Serializable { @Column(name = "`created_at`") @ApiModelProperty(value = "createdAt") - private Date createdAt; + private Long createdAt; @Column(name = "`updated_at`") @ApiModelProperty(value = "updatedAt") - private Date updatedAt; + private Long updatedAt; @Column(name = "`mini_open_id`") @ApiModelProperty(value = "小程序openId") diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java index 423a5e48..2d7cf328 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java @@ -29,7 +29,9 @@ import cn.ysk.cashier.vo.TbOrderPayCountVo; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -54,7 +56,13 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { private final TbOrderDetailRepository tbOrderDetailRepository; @Override - public Map queryAll(TbOrderInfoQueryCriteria criteria, Pageable pageable) { + public Map queryAllPage(TbOrderInfoQueryCriteria criteria) { + Pageable pageable = PageRequest.of(criteria.getPage(), criteria.getPageSize(), Sort.by(Sort.Direction.DESC, "createdAt")); + if(criteria!=null){ + if (criteria.getOrderType().equals("0")) { + criteria.setOrderType(null); + } + } Page page = tbOrderInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable); List orderInfoVoList = new ArrayList<>(); for (TbOrderInfo tbOrderInfo : page.getContent()) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderInfoService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderInfoService.java index 3fd9efbf..da9bc4c6 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderInfoService.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderInfoService.java @@ -37,10 +37,9 @@ public interface TbOrderInfoService { /** * 查询数据分页 * @param criteria 条件 - * @param pageable 分页参数 * @return Map */ - Map queryAll(TbOrderInfoQueryCriteria criteria, Pageable pageable); + Map queryAllPage(TbOrderInfoQueryCriteria criteria); /** * 根据支付类型统计 diff --git a/eladmin-system/src/main/resources/config/application.yml b/eladmin-system/src/main/resources/config/application.yml index f5e14942..0b683b9b 100644 --- a/eladmin-system/src/main/resources/config/application.yml +++ b/eladmin-system/src/main/resources/config/application.yml @@ -11,6 +11,9 @@ spring: time-zone: GMT+8 default-property-inclusion: always data: + web: + pageable: + default-page-size: 10 redis: repositories: enabled: false