From 6ab383249b70a9646ffde1474b59dcc7d0b97df6 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 15:05:15 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java
index f75fcaf..bed7d05 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java
@@ -1,6 +1,7 @@
package com.ruoyi.member.domain.vo;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import com.ruoyi.system.api.domain.vo.MerGoodsPriceListVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,19 +22,22 @@
@ApiModelProperty(value = "优惠券id 新增不传")
private String couponId;
- @ApiModelProperty("优惠券类型1.满减2.折扣3.代金4.商品")
+ @ApiModelProperty(value="优惠券类型1.满减2.折扣3.代金4.商品")
private Integer couponType;
- @ApiModelProperty("优惠券名称")
+ @ApiModelProperty(value="优惠券名称")
private String couponName;
- @ApiModelProperty(value = "发送类型1.手动领取2.全部用户3.会员用户4非会员用户5自定义")
+ @ApiModelProperty(value = "发送类型1.手动领取2.指定发放")
private Integer sendType;
- @ApiModelProperty("发送时间类型1立即2定时")
+ @ApiModelProperty(value = "发送对象2.全部用户3.会员用户4非会员用户5自定义")
+ private Integer sendTarget;
+
+ @ApiModelProperty(value="发送时间类型1立即2定时")
private Integer sendTimeType;
- @ApiModelProperty("发送时间")
+ @ApiModelProperty(value="发送时间")
private Date sendTime;
@ApiModelProperty(value = "使用范围1.全场2.指定商品")
@@ -60,14 +64,12 @@
@ApiModelProperty(value = "折扣百分比")
private BigDecimal discountPercent;
+ @ApiModelProperty(value = "领取限制数量 0为不限")
+ private Integer limitNumber;
+
@ApiModelProperty(value = "选择商品集合")
- private List<MgtCouponGoodsListVo> relGoodsList;
+ private List<MerGoodsPriceListVo> relGoodsList;
- @ApiModelProperty(value = "关联类型1.用户管理筛选2.活动管理筛选")
- private Integer relationType;
-
- @ApiModelProperty(value = "关联活动id")
- private String relationActivityId;
@ApiModelProperty(value = "关联用户集合")
private List<MgtCouponMemberListVo> relUserList;
--
Gitblit v1.7.1