From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/CouponReceiveDetailVO.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/CouponReceiveDetailVO.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/CouponReceiveDetailVO.java
index 61c80c1..003056f 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/CouponReceiveDetailVO.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/CouponReceiveDetailVO.java
@@ -1,9 +1,13 @@
package com.ruoyi.promotion.controller.management.vo;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.enums.CouponUseEnum;
+import com.ruoyi.promotion.converter.CouponUseEnumConverter;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
@@ -13,28 +17,40 @@
*/
@Data
@ApiModel(value = "管理后台-优惠券领取详情视图对象", description = "管理后台-优惠券领取详情视图对象")
-public class CouponReceiveDetailVO {
+public class CouponReceiveDetailVO implements Serializable {
+
+ private static final long serialVersionUID = 7898162954825380293L;
+ @ApiModelProperty(value = "会员优惠券id")
+ @ExcelIgnore
+ private Long id;
@ApiModelProperty(value = "优惠券id")
+ @ExcelIgnore
private Long couponId;
@ApiModelProperty(value = "优惠券id")
+ @ExcelIgnore
private Long memberId;
@ApiModelProperty(value = "会员姓名")
- private String realName;
+ @ExcelProperty("会员姓名")
+ private String nickname;
@ApiModelProperty(value = "联系电话")
+ @ExcelProperty("联系电话")
private String phone;
- @ApiModelProperty(value = "订单编号")
+ @ApiModelProperty(value = "使用订单")
+ @ExcelProperty("使用订单")
private String orderNo;
@ApiModelProperty(value = "使用时间")
+ @ExcelProperty("使用时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createTime;
+ private LocalDateTime useTime;
- @ApiModelProperty(value = "优惠券状态 0：未使用， 1：已使用")
+ @ApiModelProperty(value = "使用状态 0：未使用， 1：已使用")
+ @ExcelProperty(value = "使用状态", converter = CouponUseEnumConverter.class)
private CouponUseEnum couponStatus;
}
--
Gitblit v1.7.1