From ad6c63c4a1abf1ea1baf3bc9de21bdc01eb8bb1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E6=96=87=E9=9D=99WWW?= <15144434+wen-wenjing-www@user.noreply.gitee.com> Date: Mon, 7 Jul 2025 00:29:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=86=E6=9E=90and?= =?UTF-8?q?=E7=B4=A0=E6=9D=90=E8=B7=AF=E7=BA=BF=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++++ .../aircraft/api/od/dao/OdOrderMapper.java | 10 ++++++++++ .../com/aircraft/api/od/entity/OdOrder.java | 7 ++++++- .../api/od/service/OdOrderService.java | 2 ++ .../od/service/impl/OdOrderServiceImpl.java | 19 ++++++++++++++++++- src/main/resources/mapper/OdOrderMapper.xml | 6 ++++++ src/main/resources/mybatis-plus.properties | 4 ++-- 7 files changed, 48 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d9fd3f4..cc9c4ed 100644 --- a/pom.xml +++ b/pom.xml @@ -333,6 +333,10 @@ junit test + + org.springframework.boot + spring-boot-starter-data-jpa + diff --git a/src/main/java/com/aircraft/api/od/dao/OdOrderMapper.java b/src/main/java/com/aircraft/api/od/dao/OdOrderMapper.java index b2daf43..77136b0 100644 --- a/src/main/java/com/aircraft/api/od/dao/OdOrderMapper.java +++ b/src/main/java/com/aircraft/api/od/dao/OdOrderMapper.java @@ -3,6 +3,9 @@ package com.aircraft.api.od.dao; import com.aircraft.api.od.entity.OdOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.time.LocalDateTime; +import java.util.List; + /** *

* Mapper 接口 @@ -13,4 +16,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface OdOrderMapper extends BaseMapper { + /** + * 根据创建时间范围查询订单列表 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return 订单列表 + */ + List selectByCreateTimeBetween(LocalDateTime startTime, LocalDateTime endTime); } diff --git a/src/main/java/com/aircraft/api/od/entity/OdOrder.java b/src/main/java/com/aircraft/api/od/entity/OdOrder.java index f3bd4ab..1b67239 100644 --- a/src/main/java/com/aircraft/api/od/entity/OdOrder.java +++ b/src/main/java/com/aircraft/api/od/entity/OdOrder.java @@ -42,7 +42,7 @@ public class OdOrder implements Serializable { private String merchantAccount; @ApiModelProperty(value = "支付金额") - private String amount; + private float amount; @ApiModelProperty(value = "创建时间") private LocalDateTime createtime; @@ -59,5 +59,10 @@ public class OdOrder implements Serializable { @ApiModelProperty(value = "状态,t,f") private String state; + @ApiModelProperty(value = "开始时间") + private LocalDateTime startTime; + + @ApiModelProperty(value = "结束时间") + private LocalDateTime endTime; } diff --git a/src/main/java/com/aircraft/api/od/service/OdOrderService.java b/src/main/java/com/aircraft/api/od/service/OdOrderService.java index b10c61a..2f5ab4e 100644 --- a/src/main/java/com/aircraft/api/od/service/OdOrderService.java +++ b/src/main/java/com/aircraft/api/od/service/OdOrderService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.aircraft.api.od.entity.OdOrder; import com.baomidou.mybatisplus.extension.service.IService; +import java.time.LocalDateTime; import java.util.List; /** @@ -31,4 +32,5 @@ public interface OdOrderService extends IService { */ IPage page(OdOrder example,IPage page); + List findByCreateTimeBetween(LocalDateTime localDateTime, LocalDateTime localDateTime1); } diff --git a/src/main/java/com/aircraft/api/od/service/impl/OdOrderServiceImpl.java b/src/main/java/com/aircraft/api/od/service/impl/OdOrderServiceImpl.java index 22b2037..d647b20 100644 --- a/src/main/java/com/aircraft/api/od/service/impl/OdOrderServiceImpl.java +++ b/src/main/java/com/aircraft/api/od/service/impl/OdOrderServiceImpl.java @@ -6,8 +6,10 @@ import com.aircraft.api.od.entity.OdOrder; import com.aircraft.api.od.dao.OdOrderMapper; import com.aircraft.api.od.service.OdOrderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.List; /** @@ -20,7 +22,8 @@ import java.util.List; */ @Service public class OdOrderServiceImpl extends ServiceImpl implements OdOrderService { - + @Autowired + private OdOrderMapper odOrderMapper; @Override public List list(OdOrder example) { return this.list(buildWrapper(example)); @@ -31,6 +34,20 @@ public class OdOrderServiceImpl extends ServiceImpl impl return this.page(page,buildWrapper(example)); } + @Override + public List findByCreateTimeBetween(LocalDateTime startTime, LocalDateTime endTime) { + // 参数校验 + if (startTime == null || endTime == null) { + throw new IllegalArgumentException("开始时间和结束时间不能为空"); + } + if (startTime.isAfter(endTime)) { + throw new IllegalArgumentException("开始时间不能晚于结束时间"); + } + + // 调用Mapper方法查询订单数据 + return odOrderMapper.selectByCreateTimeBetween(startTime, endTime); + } + /** * 构建查询 * diff --git a/src/main/resources/mapper/OdOrderMapper.xml b/src/main/resources/mapper/OdOrderMapper.xml index 1cd3194..f4d9b48 100644 --- a/src/main/resources/mapper/OdOrderMapper.xml +++ b/src/main/resources/mapper/OdOrderMapper.xml @@ -22,4 +22,10 @@ id, memberid, order_num, member_account, merchant_account, amount, createtime, pa_order_type, paymen_status, result, state + + diff --git a/src/main/resources/mybatis-plus.properties b/src/main/resources/mybatis-plus.properties index a0e7bd1..6ee55d6 100644 --- a/src/main/resources/mybatis-plus.properties +++ b/src/main/resources/mybatis-plus.properties @@ -7,11 +7,11 @@ author=gjj ##############����·��############### parent=com.pixelai.api.pa ##############���ݿ����############### -url=jdbc:postgresql://129.211.33.98:54321/pixelai +url=jdbc:postgresql://129.211.33.98:54321/aircraft userName=postgres password=scutensave ##############��Ҫ���ɵı���########### -tableName=pa_picture_wall +tableName=route # pa_service_option # pa_the_charts,pa_collection,pa_creation,pa_creation_release,pa_recommend # pa_vip_level,pa_vip_currency,pa_vip,pa_consumption,pa_services