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-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/Coupon.java | 89 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/Coupon.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/Coupon.java
index 034f741..31e9e4c 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/Coupon.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/Coupon.java
@@ -54,10 +54,15 @@
@TableField("coupon_name")
private String couponName;
/**
- * 发送类型1.手动领取2.全部用户3.会员用户4非会员用户5自定义
+ * 发送类型1.手动领取2.指定发放
*/
@TableField("send_type")
private Integer sendType;
+ /**
+ * 发送对象2.全部用户3.会员用户4非会员用户5自定义
+ */
+ @TableField("send_target")
+ private Integer sendTarget;
/**
* 发送时间类型1立即2定时
*/
@@ -89,7 +94,7 @@
@TableField("use_scope")
private Integer useScope;
/**
- * 有效期类型
+ * 有效期类型1.时间段2.领取之日起
*/
@TableField("valid_time_type")
private Integer validTimeType;
@@ -117,6 +122,86 @@
@TableField("update_user_id")
private Long updateUserId;
+ /**
+ * 优惠券来源1平台2商户
+ */
+ @TableField("coupon_from")
+ private Integer couponFrom;
+
+ /**
+ * 商户id
+ */
+ @TableField("shop_id")
+ private Long shopId;
+
+ /**
+ * 关联商品ids
+ */
+ @TableField("rel_goods_ids")
+ private String relGoodsIds;
+
+ /**
+ * 审核状态1申请中2审核通过3审核拒绝
+ */
+ @TableField("audit_status")
+ private Integer auditStatus;
+
+ /**
+ * 审核理由
+ */
+ @TableField("audit_reason")
+ private String auditReason;
+
+ /**
+ * 关联类型1.用户管理筛选2.活动管理筛选
+ */
+ @TableField("relation_type")
+ private Integer relationType;
+
+ /**
+ * 关联活动类型1.秒杀活动
+ */
+ @TableField("relation_activity_type")
+ private Integer relationActivityType;
+
+ /**
+ * 关联活动id
+ */
+ @TableField("relation_activity_id")
+ private String relationActivityId;
+
+ /**
+ * 领取限制数量
+ */
+ @TableField("limit_number")
+ private Integer limitNumber;
+
+ /**
+ * 是否发放过
+ */
+ @TableField("send_flag")
+ private Integer sendFlag;
+
+ @TableField("rel_user_ids")
+ private String relUserIds;
+
+ /**
+ * 宣传海报
+ */
+ @TableField("propaganda_poster")
+ private String propagandaPoster;
+
+ /**
+ * 发放限制数量
+ */
+ @TableField("send_limit_number")
+ private Integer sendLimitNumber;
+ /**
+ * 发放限制0否1是
+ */
+ @TableField("send_limit_flag")
+ private Integer sendLimitFlag;
+
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1