From f2f07f9c707dc4793c42c90c4039b41a59c3d0f2 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 26 六月 2023 19:51:23 +0800
Subject: [PATCH] 商户端和管理台联调bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/Coupon.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 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..8c9076f 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
@@ -89,7 +89,7 @@
@TableField("use_scope")
private Integer useScope;
/**
- * 有效期类型
+ * 有效期类型1.时间段2.领取之日起
*/
@TableField("valid_time_type")
private Integer validTimeType;
@@ -117,7 +117,60 @@
@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;
+
@Override
protected Serializable pkVal() {
return this.couponId;
--
Gitblit v1.7.1