From 188b7916433efa3d8a686d899d0a926b696623cd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 09 八月 2024 09:36:12 +0800
Subject: [PATCH] 优惠券管理代码提交
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
index 9519eee..43c0f6d 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
@@ -5,21 +5,32 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDateTime;
+
@Data
@ApiModel("管理后台 优惠券兑换记录列表返回VO")
public class ExchangeRecordVO {
@ApiModelProperty(value = "获得时间")
- private String name;
+ private String createTime;
@ApiModelProperty(value = "获得用户")
- private String state;
+ private String phone;
@ApiModelProperty(value = "优惠金额")
private String discountAmount;
@ApiModelProperty(value = "使用门槛")
private String meetTheConditions;
- @ApiModelProperty(value = "使用状态 1未使用 2已使用")
+ @ApiModelProperty(value = "使用状态 1未使用 2已使用 3已过期 4已取消")
private Integer status;
@ApiModelProperty(value = "失效时间")
- private String endTime;
+ private String endTime1;
+ @ApiModelProperty(value = "失效时间 前端忽略")
+ private LocalDateTime endTime;
@ApiModelProperty(value = "关联订单")
private String orderId;
+ @ApiModelProperty(value = " 前端忽略 获取方式 1=积分兑换 2现金购买")
+ private Integer waysToObtain;
+ @ApiModelProperty(value = " 是否删除0否1是")
+ private Integer delFlag;
+ @ApiModelProperty(value = "三方支付流水号 前端忽略")
+ private String serialNumber;
+
}
--
Gitblit v1.7.1