From a015d2984832d4b20227fb6864f3cbad0e2f6ba8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 11:39:35 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java
index 0579937..a31866e 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java
@@ -1,6 +1,8 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.account.api.model.AppUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -8,7 +10,9 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -32,11 +36,11 @@
@ApiModelProperty(value = "删除标志（0=否，1=是）")
@TableField("del_flag")
- @TableLogic
private Integer delFlag;
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty(value = "优惠券名称")
@@ -81,11 +85,13 @@
@ApiModelProperty(value = "有效期开始时间")
@TableField("period_start_time")
- private LocalDateTime periodStartTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate periodStartTime;
@ApiModelProperty(value = "有效期结束时间")
@TableField("period_end_time")
- private LocalDateTime periodEndTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate periodEndTime;
@ApiModelProperty(value = "领取后x天有效")
@TableField("period_days")
@@ -93,10 +99,12 @@
@ApiModelProperty(value = "开始发放时间")
@TableField("send_start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime sendStartTime;
@ApiModelProperty(value = "结束发放时间")
@TableField("send_end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime sendEndTime;
@ApiModelProperty(value = "1免费发放2积分兑换")
@@ -119,14 +127,32 @@
@TableField("shelf_status")
private Integer shelfStatus;
+ @ApiModelProperty(value = "指定会员等级,逗号隔开")
+ private String vipIds;
+
@ApiModelProperty(value = "已发放数量")
@TableField(exist = false)
private Long sendNumNow;
- @ApiModelProperty(value = "指定会员等级,逗号隔开")
- private String vipIds;
+ @ApiModelProperty(value = "其他商品名称")
+ private String goodsNameJson;
- public String getIdStr() {
+
+ @ApiModelProperty(value = "其他商品名称")
+ @TableField(exist = false)
+ private List<String> goodsNameList;
+
+ @TableField(exist = false)
+ private List<Goods> goods;
+
+ @TableField(exist = false)
+ private List<AppUser> appUserList;
+
+ @TableField(exist = false)
+ private String phone;
+
+
+ public String getIdStr(){
return String.valueOf(id);
}
}
--
Gitblit v1.7.1