From 7a4f9541331bef779a506b38a27ed5c3373c0bec Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 15 五月 2025 13:53:22 +0800
Subject: [PATCH] 开发二级等保功能及心跳消息队列修改

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
index 8073eef..5a99b2a 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
@@ -1,6 +1,7 @@
 package com.ruoyi.other.api.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.web.domain.BasePojo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -38,7 +39,15 @@
     @ApiModelProperty(value = "优惠券名称")
     @TableField("name")
     private String name;
-
+    
+    @ApiModelProperty(value = "封面图")
+    @TableField("cover_picture")
+    private String coverPicture;
+    
+    @ApiModelProperty(value = "详情图片")
+    @TableField("details_picture")
+    private String detailsPicture;
+    
     @ApiModelProperty(value = "优惠方式(1=满减,2=抵扣)")
     @TableField("preferential_mode")
     private Integer preferentialMode;
@@ -69,6 +78,7 @@
 
     @ApiModelProperty(value = "使用截止时间")
     @TableField("end_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime endTime;
 
     @ApiModelProperty(value = "获取后有效天数")
@@ -96,15 +106,8 @@
     private BigDecimal vipPaymentAmount;
 
     @ApiModelProperty(value = "优惠券说明")
-    @TableField("explain")
-    private String explain;
-
-    @ApiModelProperty(value = "封面图")
-    @TableField("cover_picture")
-    private String coverPicture;
-    @ApiModelProperty(value = "详情图片")
-    @TableField("details_picture")
-    private String detailsPicture;
+    @TableField("explains")
+    private String explains;
 
     @ApiModelProperty(value = "说明")
     @TableField("remark")
@@ -119,6 +122,10 @@
     @TableField(exist = false)
     private Integer useCount;
 
+    @ApiModelProperty(value = "销量")
+    @TableField(exist = false)
+    private Integer salesCount;
+
 
 
 }

--
Gitblit v1.7.1