From 231b46b1d430c3824c289e8c232fc70d8c1879e5 Mon Sep 17 00:00:00 2001 From: qjq <1766193529@qq.com> Date: Thu, 14 Nov 2024 11:07:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/billing/vo/BillingSaveReqVO.java | 11 +++++++++-- .../member/service/billing/BillingServiceImpl.java | 7 ++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/billing/vo/BillingSaveReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/billing/vo/BillingSaveReqVO.java index e9e34a0b..cf494e46 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/billing/vo/BillingSaveReqVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/billing/vo/BillingSaveReqVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.member.controller.admin.billing.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -8,6 +9,8 @@ import java.math.BigDecimal; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + @Schema(description = "管理后台 - 开票记录新增/修改 Request VO") @Data public class BillingSaveReqVO { @@ -60,9 +63,13 @@ public class BillingSaveReqVO { @Schema(description = "发票商品名称") private String billingName; @Schema(description = "订单选择时间段-开始时间") - private LocalDateTime startTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime; @Schema(description = "订单选择时间段-结束时间") - private LocalDateTime endTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; @Schema(description = "订单id") private Set orderId; } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java index f0570f22..a988cbc6 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java @@ -43,6 +43,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import java.lang.reflect.Method; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; import java.util.Objects; import java.util.Set; @@ -79,7 +80,7 @@ public class BillingServiceImpl implements BillingService { * @param endTime * @return */ - public List getDishOrderDO(LocalDateTime startTime, LocalDateTime endTime, Set ids){ + public List getDishOrderDO(Date startTime, Date endTime, Set ids){ return dishOrderMapper.selectList(new LambdaQueryWrapperX() .betweenIfPresent(DishOrderDO::getCreateTime,startTime,endTime) .eq(DishOrderDO::getOrderStatus,DishOrderDO.COMPLETE) @@ -93,7 +94,7 @@ public class BillingServiceImpl implements BillingService { * @param endTime * @return */ - public List getStoreOrderDO(LocalDateTime startTime, LocalDateTime endTime, Set ids){ + public List getStoreOrderDO(Date startTime, Date endTime, Set ids){ return storeOrderMapper.selectList(new LambdaQueryWrapperX() .betweenIfPresent(StoreOrderDO::getCreateTime,startTime,endTime) .eq(StoreOrderDO::getStatus, StoreOrderStatusEnum.COMPLETE.getCode()) @@ -107,7 +108,7 @@ public class BillingServiceImpl implements BillingService { * @param endTime * @return */ - public List getOrderSpaceCapsuleDO(LocalDateTime startTime, LocalDateTime endTime, Set ids){ + public List getOrderSpaceCapsuleDO(Date startTime, Date endTime, Set ids){ return orderSpaceCapsuleMapper.selectList(new LambdaQueryWrapperX() .betweenIfPresent(OrderSpaceCapsuleDO::getCreateTime,startTime,endTime) .eq(OrderSpaceCapsuleDO::getStatus, SpaceCapsuleOrderEnum.SPACE_CAPSULE_ORDER_ENUM_DONE.getCode())