From d7fe7cf40ab5b5bcccf17b97f0e8c44cd4a9893c Mon Sep 17 00:00:00 2001 From: yijiegong Date: Tue, 27 Aug 2024 15:59:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0userId=E5=8F=82=E6=95=B0=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/order/TbOrderInfoController.java | 1 - .../dto/order/TbOrderInfoQueryCriteria.java | 16 ++++++++++++++++ .../impl/order/TbOrderInfoServiceImpl.java | 9 ++++----- 3 files changed, 20 insertions(+), 6 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 8c37a261..3fe11b9c 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 @@ -42,7 +42,6 @@ public class TbOrderInfoController { @PostMapping("/date") @ApiOperation("查询订单") - @AnonymousPostMapping public ResponseEntity queryTbOrderInfo(@RequestBody TbOrderInfoQueryCriteria criteria){ return new ResponseEntity<>(tbOrderInfoService.queryAllPage(criteria),HttpStatus.OK); } 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 b5753431..453c829f 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 @@ -70,6 +70,8 @@ public class TbOrderInfoQueryCriteria{ @Query(type = Query.Type.BETWEEN) private List createdAt; + private Integer userId; + @Query private String tableName; @@ -79,4 +81,18 @@ public class TbOrderInfoQueryCriteria{ public void setProductName(String productName) { if(StringUtils.isNotBlank(productName)) this.productName = productName; } + + public Integer getPage() { + if (page == null) { + return 0; + } + return page; + } + + public Integer getPageSize() { + if (pageSize == null) { + return 10; + } + return pageSize; + } } 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 e010e8c9..95c1a18e 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 @@ -108,6 +108,10 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { predicate = criteriaBuilder.and(predicate, criteriaBuilder.notEqual(root.get("orderType"), "return")); } + if (criteria.getUserId() != null && criteria.getUserId() != 0) { + predicate = criteriaBuilder.and(predicate, criteriaBuilder.equal(root.get("userId"), criteria.getUserId())); + } + if (StringUtils.isNotBlank(criteria.getProductName())) { Date startTime, endTime; DateTime offsetMonth = cn.hutool.core.date.DateUtil.offsetMonth(new Date(), 3); @@ -120,11 +124,6 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { startTime = new Date(startLong); endTime = new Date(endLong); - - // 如果开始时间小于三个月前，不查询 -// if (startTime.before(offsetMonth)) { -// throw new BadRequestException("查询时间范围不能超过三个月"); -// } } else { startTime = offsetMonth; endTime = new Date(); From e48029a9a483c67a0e201c23b13149ad974609e8 Mon Sep 17 00:00:00 2001 From: yijiegong Date: Wed, 28 Aug 2024 13:34:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E6=9F=A5=E8=AF=A2bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ysk/cashier/mybatis/service/impl/TbShopAdServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopAdServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopAdServiceImpl.java index c1d0c3d4..1fc80746 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopAdServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopAdServiceImpl.java @@ -96,6 +96,8 @@ public class TbShopAdServiceImpl extends ServiceImpl i return ResponseEntity.badRequest().body("店铺ID不能为空"); } + wrapper.eq("shop_id", params.get("shopId")); + if (StrUtil.isNotBlank((String) params.get("status"))) { wrapper.eq("status", params.get("status")); }