From 810d81a44d78bc3e7c42c2f116cc9968ab04baef Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 07 二月 2025 15:57:28 +0800
Subject: [PATCH] 修改门店首页统计bug
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java
index 4b9d43f..ec285bb 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java
@@ -1,13 +1,16 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -31,7 +34,6 @@
@ApiModelProperty(value = "删除标志（0=否，1=是）")
@TableField("del_flag")
- @TableLogic
private Integer delFlag;
@ApiModelProperty(value = "添加时间")
@@ -52,11 +54,26 @@
@ApiModelProperty(value = "活动开始日期")
@TableField("start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
@ApiModelProperty(value = "活动结束日期")
@TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
+ @ApiModelProperty(value = "是否上架：0否 1是")
+ @TableField("is_shelves")
+ private Integer isShelves;
+
+
+ @TableField(exist = false)
+ private List<GoodsSeckill> goodsSeckills;
+
+ @TableField(exist = false)
+ private Goods goods;
+
}
--
Gitblit v1.7.1