From a8d2cb07f6440dc54dc4005b0b06d5a47cb1517d Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期一, 16 十二月 2024 13:34:03 +0800 Subject: [PATCH] 12.16 --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CouponInfoVo.java | 137 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 113 insertions(+), 24 deletions(-) diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CouponInfoVo.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CouponInfoVo.java index 106134c..3ceb775 100644 --- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CouponInfoVo.java +++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CouponInfoVo.java @@ -1,36 +1,125 @@ package com.ruoyi.account.api.vo; + +import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serializable; import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; /** - * @author zhibing.pu - * @Date 2024/11/25 17:59 + * <p> + * + * </p> + * + * @author luodangjia + * @since 2024-11-20 */ @Data -@ApiModel -public class CouponInfoVo { - @ApiModelProperty("优惠券id") - private Long id; - @ApiModelProperty("优惠券名称") - private String name; - @ApiModelProperty("优惠券类型 1=满减券,2=代金券,3=折扣券,4=商品券") - private Integer couponType; - @ApiModelProperty("满x元") - private BigDecimal conditionAmount; - @ApiModelProperty("减x元") - private BigDecimal discountAmount; - @ApiModelProperty("代金x元") - private BigDecimal moneyAmount; - @ApiModelProperty("折扣") - private BigDecimal discount; - @ApiModelProperty("有效期开始时间") - private String periodStartTime; - @ApiModelProperty("有效期结束时间") - private String periodEndTime; - @ApiModelProperty("是否可用") - private Boolean available; +@EqualsAndHashCode(callSuper = false) +@TableName("t_coupon_info") +@ApiModel(value="CouponInfo对象", description="") +public class CouponInfoVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "删除标志(0=否,1=是)") + @TableField("del_flag") + @TableLogic + private Integer delFlag; + + @ApiModelProperty(value = "添加时间") + @TableField("create_time") + private LocalDateTime createTime; + + @ApiModelProperty(value = "优惠券名称") + @TableField("coupon_name") + private String couponName; + + @ApiModelProperty(value = "优惠券类型 1'满减券',2'代金券',3'折扣券',4'商品券'") + @TableField("coupon_type") + private Integer couponType; + + @ApiModelProperty(value = "满x元") + @TableField("condition_amount") + private BigDecimal conditionAmount; + + @ApiModelProperty(value = "减x元") + @TableField("discount_amount") + private BigDecimal discountAmount; + + @ApiModelProperty(value = "代金x元") + @TableField("money_amount") + private BigDecimal moneyAmount; + + @ApiModelProperty(value = "折扣") + @TableField("discount") + private BigDecimal discount; + + @ApiModelProperty(value = "适用商品ids,全部-1") + @TableField("for_good_ids") + private String forGoodIds; + + @ApiModelProperty(value = "发放数量") + @TableField("send_num") + private Integer sendNum; + + @ApiModelProperty(value = "可领数量") + @TableField("max_num") + private Integer maxNum; + + @ApiModelProperty(value = "有效期类型 1指定时间内有效 2领取后x天有效") + @TableField("period_type") + private Integer periodType; + + @ApiModelProperty(value = "有效期开始时间") + @TableField("period_start_time") + private LocalDateTime periodStartTime; + + @ApiModelProperty(value = "有效期结束时间") + @TableField("period_end_time") + private LocalDateTime periodEndTime; + + @ApiModelProperty(value = "领取后x天有效") + @TableField("period_days") + private Integer periodDays; + + @ApiModelProperty(value = "开始发放时间") + @TableField("send_start_time") + private LocalDateTime sendStartTime; + + @ApiModelProperty(value = "结束发放时间") + @TableField("send_end_time") + private LocalDateTime sendEndTime; + + @ApiModelProperty(value = "1免费发放2积分兑换") + @TableField("send_type") + private Integer sendType; + + @ApiModelProperty(value = "兑换所需积分") + @TableField("need_point") + private BigDecimal needPoint; + + @ApiModelProperty(value = "可领用户 1全部 2指定人员 3指定会员 4 新人注册") + @TableField("person_type") + private Integer personType; + + @ApiModelProperty(value = "可领取对应的ids,用find_in_set查询") + @TableField("person_ids") + private String personIds; + + @ApiModelProperty(value = "商品卷对应的商品名称") + @TableField(exist = false) + private List<String> goodNames; + + } -- Gitblit v1.7.1