From 8d414ac646d29ddaff675a3985cedd70bd0d56c4 Mon Sep 17 00:00:00 2001 From: chenxiky <2868613334@qq.com> Date: Fri, 25 Jul 2025 19:52:40 +0800 Subject: [PATCH] =?UTF-8?q?perf:=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=88=E6=94=AF=E6=8C=81=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=9F=9F=E5=AD=97=E6=AE=B5&?= =?UTF-8?q?=E8=80=83=E8=99=91=E6=94=AF=E6=92=91=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aircraft/modules/order/biz/OrderBiz.java | 12 ++++++++++++ .../modules/order/domain/OrderMain.java | 5 +++++ .../domain/dto/OrderMainPageQueryDTO.java | 19 ++++++++++++++++++- .../order/domain/vo/OrderMainPageQueryVO.java | 6 ++++++ .../service/impl/OrderMainServiceImpl.java | 11 ++++++----- 5 files changed, 47 insertions(+), 6 deletions(-) diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java index 3d48a07..ac32119 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java @@ -2,6 +2,7 @@ package com.aircraft.modules.order.biz; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.aircraft.exception.BadRequestException; @@ -45,6 +46,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -185,6 +187,15 @@ public class OrderBiz { */ private List adminAllOrderQueryList(OrderMainPageQueryDTO pageQueryDTO) { // TODO 需要考虑用户角色获取对应的数据（财务、区域、管理员角色） + // 处理时间格式 + if (ObjectUtil.isNotNull(pageQueryDTO.getQueryStartTime())) { + Date start = DateUtil.beginOfDay(pageQueryDTO.getQueryStartTime()); + pageQueryDTO.setQueryStartTime(start); + } + if (ObjectUtil.isNotNull(pageQueryDTO.getQueryEndTime())) { + Date end = DateUtil.endOfDay(pageQueryDTO.getQueryEndTime()); + pageQueryDTO.setQueryEndTime(end); + } List list = orderMainService.queryAll(pageQueryDTO); return list; } @@ -247,6 +258,7 @@ public class OrderBiz { orderMain.setOrderCreateTime(addOrderDTO.getOrderCreateTime()); orderMain.setMainOrderStatus(MainOrderStatusEnum.NOT_STARTED.getCode()); orderMain.setSettlementStatus(OrderSettlementStatusEnum.NOT_SETTLED.getCode()); + orderMain.setAreaId(scenic.getAreaId()); return orderMain; } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java index 9ce8450..8f49e10 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java @@ -50,6 +50,11 @@ public class OrderMain extends BaseEntity { */ private String phone; + /** + * 区域ID + */ + private Long areaId; + /** * 景区ID */ diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/OrderMainPageQueryDTO.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/OrderMainPageQueryDTO.java index f02351b..1cb9646 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/OrderMainPageQueryDTO.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/OrderMainPageQueryDTO.java @@ -2,6 +2,9 @@ package com.aircraft.modules.order.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * @@ -29,13 +32,27 @@ public class OrderMainPageQueryDTO { /** * 客户手机号 */ - @ApiModelProperty(value = "客户手机号", example = "13788888888") + @ApiModelProperty(value = "客户手机号", example = "13456767894") private String phone; /** * 发起人ID */ + @ApiModelProperty(value = "发起人ID(无需填写)") private Long orderInitiatorId; + /** + * 下单开始时间 + */ + @ApiModelProperty(value = "下单开始时间", example = "2025-07-19") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date queryStartTime; + + /** + * 下单结束时间 + */ + @ApiModelProperty(value = "下单结束时间", example = "2025-07-19") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date queryEndTime; } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderMainPageQueryVO.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderMainPageQueryVO.java index 688df6a..0276b1d 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderMainPageQueryVO.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderMainPageQueryVO.java @@ -57,6 +57,12 @@ public class OrderMainPageQueryVO { @ApiModelProperty(value = "发起人手机号") private String initiatorPhone; + /** + * 区域ID + */ + @ApiModelProperty(value = "区域ID") + private Long areaId; + /** * 景区ID */ diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java index 48c7727..8744a20 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java @@ -33,12 +33,13 @@ public class OrderMainServiceImpl extends ServiceImpl queryAll(OrderMainPageQueryDTO pageQueryDTO) { - - // TODO 构建查询条件 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ObjectUtil.isNotNull(pageQueryDTO.getAttractionId()),OrderMain::getAttractionId, pageQueryDTO.getAttractionId()); - queryWrapper.eq(ObjectUtil.isNotNull(pageQueryDTO.getAttractionId()),OrderMain::getCustomerId, pageQueryDTO.getCustomerId()); - queryWrapper.eq(StrUtil.isNotBlank(pageQueryDTO.getPhone()),OrderMain::getPhone, pageQueryDTO.getPhone()); + queryWrapper.eq(ObjectUtil.isNotNull(pageQueryDTO.getAttractionId()), OrderMain::getAttractionId, pageQueryDTO.getAttractionId()); + queryWrapper.eq(ObjectUtil.isNotNull(pageQueryDTO.getCustomerId()), OrderMain::getCustomerId, pageQueryDTO.getCustomerId()); + queryWrapper.eq(StrUtil.isNotBlank(pageQueryDTO.getPhone()), OrderMain::getPhone, pageQueryDTO.getPhone()); + // 添加时间查询条件 + queryWrapper.ge(ObjectUtil.isNotNull(pageQueryDTO.getQueryStartTime()), OrderMain::getOrderCreateTime, pageQueryDTO.getQueryStartTime()); + queryWrapper.le(ObjectUtil.isNotNull(pageQueryDTO.getQueryEndTime()), OrderMain::getOrderCreateTime, pageQueryDTO.getQueryEndTime()); return list(queryWrapper); }