zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

时间类型处理

Browse Source
This commit is contained in:
qjq
2024-11-14 11:07:09 +08:00
parent 375264ce86
commit 231b46b1d4
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/billing/vo/BillingSaveReqVO.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.member.controller.admin.billing.vo; 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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
@ -8,6 +9,8 @@ import java.math.BigDecimal;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; 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") @Schema(description = "管理后台 - 开票记录新增/修改 Request VO")
@Data @Data
public class BillingSaveReqVO { public class BillingSaveReqVO {
@ -60,9 +63,13 @@ public class BillingSaveReqVO {
@Schema(description = "发票商品名称") @Schema(description = "发票商品名称")
private String billingName; private String billingName;
@Schema(description = "订单选择时间段-开始时间") @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 = "订单选择时间段-结束时间") @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") @Schema(description = "订单id")
private Set<Long> orderId; private Set<Long> orderId;
} }

7
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java
View File

@ -43,6 +43,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
@ -79,7 +80,7 @@ public class BillingServiceImpl implements BillingService {
* @param endTime * @param endTime
* @return * @return
*/ */
public List<DishOrderDO> getDishOrderDO(LocalDateTime startTime, LocalDateTime endTime, Set<Long> ids){ public List<DishOrderDO> getDishOrderDO(Date startTime, Date endTime, Set<Long> ids){
return dishOrderMapper.selectList(new LambdaQueryWrapperX<DishOrderDO>() return dishOrderMapper.selectList(new LambdaQueryWrapperX<DishOrderDO>()
.betweenIfPresent(DishOrderDO::getCreateTime,startTime,endTime) .betweenIfPresent(DishOrderDO::getCreateTime,startTime,endTime)
.eq(DishOrderDO::getOrderStatus,DishOrderDO.COMPLETE) .eq(DishOrderDO::getOrderStatus,DishOrderDO.COMPLETE)
@ -93,7 +94,7 @@ public class BillingServiceImpl implements BillingService {
* @param endTime * @param endTime
* @return * @return
*/ */
public List<StoreOrderDO> getStoreOrderDO(LocalDateTime startTime, LocalDateTime endTime, Set<Long> ids){ public List<StoreOrderDO> getStoreOrderDO(Date startTime, Date endTime, Set<Long> ids){
return storeOrderMapper.selectList(new LambdaQueryWrapperX<StoreOrderDO>() return storeOrderMapper.selectList(new LambdaQueryWrapperX<StoreOrderDO>()
.betweenIfPresent(StoreOrderDO::getCreateTime,startTime,endTime) .betweenIfPresent(StoreOrderDO::getCreateTime,startTime,endTime)
.eq(StoreOrderDO::getStatus, StoreOrderStatusEnum.COMPLETE.getCode()) .eq(StoreOrderDO::getStatus, StoreOrderStatusEnum.COMPLETE.getCode())
@ -107,7 +108,7 @@ public class BillingServiceImpl implements BillingService {
* @param endTime * @param endTime
* @return * @return
*/ */
public List<OrderSpaceCapsuleDO> getOrderSpaceCapsuleDO(LocalDateTime startTime, LocalDateTime endTime, Set<Long> ids){ public List<OrderSpaceCapsuleDO> getOrderSpaceCapsuleDO(Date startTime, Date endTime, Set<Long> ids){
return orderSpaceCapsuleMapper.selectList(new LambdaQueryWrapperX<OrderSpaceCapsuleDO>() return orderSpaceCapsuleMapper.selectList(new LambdaQueryWrapperX<OrderSpaceCapsuleDO>()
.betweenIfPresent(OrderSpaceCapsuleDO::getCreateTime,startTime,endTime) .betweenIfPresent(OrderSpaceCapsuleDO::getCreateTime,startTime,endTime)
.eq(OrderSpaceCapsuleDO::getStatus, SpaceCapsuleOrderEnum.SPACE_CAPSULE_ORDER_ENUM_DONE.getCode()) .eq(OrderSpaceCapsuleDO::getStatus, SpaceCapsuleOrderEnum.SPACE_CAPSULE_ORDER_ENUM_DONE.getCode())