活动类增加会员类型

share-system/src/main/java/share/system/domain/Activity.java

@@ -44,6 +44,13 @@ public class Activity extends BaseEntity {
     private BigDecimal discountRatio;
 
     /**
+     * 会员类型
+     */
+    @Excel(name = "会员类型")
+    private Long memberType;
+
+
+    /**
      * 门店枚举
      */
     @Excel(name = "门店枚举")

share-system/src/main/resources/mapper/system/ActivityMapper.xml

@@ -9,6 +9,7 @@
         <result property="activityName" column="activity_name"/>
         <result property="activityDescription" column="activity_description"/>
         <result property="discountRatio" column="discount_ratio"/>
+        <result property="memberType" column="member_type"/>
         <result property="storeIds" column="store_ids"/>
         <result property="labelId" column="label_id"/>
         <result property="packId" column="pack_id"/>
@@ -27,6 +28,7 @@
                activity_name,
                activity_description,
                discount_ratio,
+               member_type,
                store_ids,
                label_id,
                pack_id,
@@ -51,6 +53,7 @@
                 #{activityDescription}
             </if>
             <if test="discountRatio != null ">and discount_ratio = #{discountRatio}</if>
+            <if test="memberType != null ">and member_type = #{memberType}</if>
             <if test="storeIds != null  and storeIds != ''">and store_ids = #{storeIds}</if>
             <if test="labelId != null ">and label_id = #{labelId}</if>
             <if test="packId != null ">and pack_id = #{packId}</if>
@@ -71,6 +74,7 @@
             <if test="activityName != null">activity_name,</if>
             <if test="activityDescription != null">activity_description,</if>
             <if test="discountRatio != null">discount_ratio,</if>
+            <if test="memberType != null">member_type,</if>
             <if test="storeIds != null">store_ids,</if>
             <if test="labelId != null">label_id,</if>
             <if test="packId != null">pack_id,</if>
@@ -87,6 +91,7 @@
             <if test="activityName != null">#{activityName},</if>
             <if test="activityDescription != null">#{activityDescription},</if>
             <if test="discountRatio != null">#{discountRatio},</if>
+            <if test="memberType != null">#{memberType},</if>
             <if test="storeIds != null">#{storeIds},</if>
             <if test="labelId != null">#{labelId},</if>
             <if test="packId != null">#{packId},</if>
@@ -107,6 +112,7 @@
             <if test="activityName != null">activity_name = #{activityName},</if>
             <if test="activityDescription != null">activity_description = #{activityDescription},</if>
             <if test="discountRatio != null">discount_ratio = #{discountRatio},</if>
+            <if test="memberType != null">member_type = #{memberType},</if>
             <if test="storeIds != null">store_ids = #{storeIds},</if>
             <if test="labelId != null">label_id = #{labelId},</if>
             <if test="packId != null">pack_id = #{packId},</if>