From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberCoupon.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberCoupon.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberCoupon.java
index 166450e..3abf2b4 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberCoupon.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberCoupon.java
@@ -23,7 +23,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@TableName("t_user_coupon")
+@TableName("t_member_coupon")
public class MemberCoupon extends Model<MemberCoupon> {
private static final long serialVersionUID = 1L;
@@ -45,6 +45,9 @@
*/
@TableField("user_id")
private Long userId;
+
+ @TableField("shop_id")
+ private Long shopId;
/**
* 优惠券类型1.满减2.折扣3.代金4.商品
*/
@@ -61,10 +64,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定时
*/
@@ -134,6 +142,12 @@
@TableField("rel_goods_ids")
private String relGoodsIds;
+ /**
+ * 优惠券来源1平台2商户
+ */
+ @TableField("coupon_from")
+ private Integer couponFrom;
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1