From 7dce9828e84642d5f37429fff2448dd9c11f71aa Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 07 Jan 2025 11:17:52 +0800
Subject: [PATCH] feat(mall): 添加折扣活动功能

---
 src/main/java/cc/mrbird/febs/mall/entity/MallActivity.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallActivity.java b/src/main/java/cc/mrbird/febs/mall/entity/MallActivity.java
index 3c4df30..7f87e92 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallActivity.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallActivity.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
@@ -14,16 +15,16 @@
     private String name;
     //活动编码
     private String code;
-    //活动大图
-    private String maxImage;
-    //活动小图
-    private String minImage;
     //开始时间
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startTime;
     //结束时间
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endTime;
+    //活动大图
+    private String maxImage;
+    //活动小图
+    private String minImage;
     //活动状态 1-开启 0-关闭
     private Integer state;
     //活动说明
@@ -32,4 +33,10 @@
      * 活动类型 1、折扣 2、优惠券
      */
     private Integer type;
+
+    private Long couponId;//优惠券id
+
+    private BigDecimal discountSize;//折扣粒度
+
+    private String activityGoodsIds;//关联的商品ids
 }

--
Gitblit v1.9.1