From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 17 一月 2025 16:40:43 +0800 Subject: [PATCH] bug修改 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyCouponVo.java | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyCouponVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyCouponVo.java index aec0f67..1e622c4 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyCouponVo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyCouponVo.java @@ -1,9 +1,11 @@ package com.ruoyi.order.domain.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.system.api.domain.vo.MerCouponGoodsListVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -16,15 +18,32 @@ @Data public class MerVerifyCouponVo { + @ApiModelProperty(value = "核销状态1.未核销2.已核销") + private Integer verifyStatus; + @ApiModelProperty(value = "用户姓名") private String userName; @ApiModelProperty(value = "用户电话") private String userMobile; + @ApiModelProperty(value = "优惠券id") + private Long memberCouponId; + + @ApiModelProperty(value = "优惠券id--前端") + private String couponId; + + @ApiModelProperty(value = "优惠券名称") + private String couponName; + @ApiModelProperty(value = "优惠券来源") private String couponFrom; - @ApiModelProperty(value = "优惠券来源") + @ApiModelProperty(value = "获奖时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @ApiModelProperty(value = "优惠券商品列表") private List<MerCouponGoodsListVo> goodsList; + } -- Gitblit v1.7.1