From ff399ed346334267d075d0ae7586936b680650f7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 15:28:28 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 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 f4eb5d1..7598c4c 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>
@@ -37,6 +41,7 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty(value = "优惠券名称")
@@ -81,11 +86,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 +100,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,5 +128,29 @@
@TableField("shelf_status")
private Integer shelfStatus;
+ @ApiModelProperty(value = "指定会员等级,逗号隔开")
+ private String vipIds;
+ @ApiModelProperty(value = "已发放数量")
+ @TableField(exist = false)
+ private Long sendNumNow;
+
+ @ApiModelProperty(value = "其他商品名称")
+ private String goodsNameJson;
+
+
+ @ApiModelProperty(value = "其他商品名称")
+ @TableField(exist = false)
+ private List<String> goodsNameList;
+
+ @TableField(exist = false)
+ private List<Goods> goods;
+
+ @TableField(exist = false)
+ private List<AppUser> appUserList;
+
+
+ public String getIdStr(){
+ return String.valueOf(id);
+ }
}
--
Gitblit v1.7.1