设置全局组织机构管理

Yijia-SaaS/yijia-market/src/main/java/com/yijia/market/domain/MarkertPlan.java

@@ -32,12 +32,28 @@ public class MarkertPlan extends BaseEntity
     @Excel(name = "优惠条件金额", readConverterExp = "1=00元")
     private String discountAmt;
 
-    /** 汽油优惠金额 */
-    @Excel(name = "汽油优惠金额")
+    /** 优惠金额 */
+    @Excel(name = "优惠金额")
     private String gasoilDiscountAmt;
-
-    /** 柴油优惠金额 */
-    @Excel(name = "柴油优惠金额")
+    /** 会员日活动设置：1，是；0，否； */
+    private String activityDaySetting;
+    /** 会员活动类型设置 */
+    private String activityDayType;
+
+    /** 按周活动日 */
+    private String activityDayWeek;
+
+    /** 按每月几号活动日 */
+    private String activityDayMonth;
+    /** 按固定日期 */
+    private String activityDayDate;
+    /** 按照错峰时间 */
+    private String activityDayTime;
+    /** 活动日出现重叠处理 1 按优惠叠加处理，2执行活动1 3执行活动2 执行活动3 */
+    private String activityDayDistnct;
+
+    /** 活动优惠金额 */
+    @Excel(name = "活动优惠金额")
     private String dieseloilDiscountAmt;
 
     /** 会员优惠是否叠加 */
@@ -68,6 +84,62 @@ public class MarkertPlan extends BaseEntity
     @Excel(name = "状态", readConverterExp = "1=.在用状态，2，删除")
     private String status;
 
+    public String getActivityDaySetting() {
+        return activityDaySetting;
+    }
+
+    public void setActivityDaySetting(String activityDaySetting) {
+        this.activityDaySetting = activityDaySetting;
+    }
+
+    public String getActivityDayType() {
+        return activityDayType;
+    }
+
+    public void setActivityDayType(String activityDayType) {
+        this.activityDayType = activityDayType;
+    }
+
+    public String getActivityDayWeek() {
+        return activityDayWeek;
+    }
+
+    public void setActivityDayWeek(String activityDayWeek) {
+        this.activityDayWeek = activityDayWeek;
+    }
+
+    public String getActivityDayMonth() {
+        return activityDayMonth;
+    }
+
+    public void setActivityDayMonth(String activityDayMonth) {
+        this.activityDayMonth = activityDayMonth;
+    }
+
+    public String getActivityDayDate() {
+        return activityDayDate;
+    }
+
+    public void setActivityDayDate(String activityDayDate) {
+        this.activityDayDate = activityDayDate;
+    }
+
+    public String getActivityDayTime() {
+        return activityDayTime;
+    }
+
+    public void setActivityDayTime(String activityDayTime) {
+        this.activityDayTime = activityDayTime;
+    }
+
+    public String getActivityDayDistnct() {
+        return activityDayDistnct;
+    }
+
+    public void setActivityDayDistnct(String activityDayDistnct) {
+        this.activityDayDistnct = activityDayDistnct;
+    }
+
     /**
      * 根据用户所属组织，平台，集团，油站查询条件
      */

Yijia-SaaS/yijia-market/src/main/resources/mapper/market/MarkertPlanMapper.xml

@@ -10,6 +10,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="discountTerm"    column="discount_term"    />
         <result property="discountAmt"    column="discount_amt"    />
         <result property="gasoilDiscountAmt"    column="gasoil_discount_amt"    />
+        <result property="activityDaySetting"    column="activity_day_setting"    />
+        <result property="activityDayType"    column="activity_day_type"    />
+        <result property="activityDayWeek"    column="activity_day_week"    />
+        <result property="activityDayMonth"    column="activity_day_month"    />
+        <result property="activityDayDate"    column="activity_day_date"    />
+        <result property="activityDayTime"    column="activity_day_time"    />
+        <result property="activityDayDistnct"    column="activity_day_distnct"    />
         <result property="dieseloilDiscountAmt"    column="dieseloil_discount_amt"    />
         <result property="vipDiscountyPlus"    column="vip_discounty_plus"    />
         <result property="couponPlus"    column="coupon_plus"    />
@@ -31,6 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="discountTerm != null  and discountTerm != ''"> and discount_term = #{discountTerm}</if>
             <if test="discountAmt != null  and discountAmt != ''"> and discount_amt = #{discountAmt}</if>
             <if test="gasoilDiscountAmt != null  and gasoilDiscountAmt != ''"> and gasoil_discount_amt = #{gasoilDiscountAmt}</if>
+            <if test="activityDaySetting != null  and activityDaySetting != ''"> and activity_day_setting = #{activityDaySetting}</if>
+            <if test="activityDayType != null  and activityDayType != ''"> and activity_day_type = #{activityDayType}</if>
+            <if test="activityDayWeek != null  and activityDayWeek != ''"> and activity_day_week = #{activityDayWeek}</if>
+            <if test="activityDayMonth != null  and activityDayMonth != ''"> and activity_day_month = #{activityDayMonth}</if>
+            <if test="activityDayDate != null  and activityDayDate != ''"> and activity_day_date = #{activityDayDate}</if>
+            <if test="activityDayTime != null  and activityDayTime != ''"> and activity_day_time = #{activityDayTime}</if>
+            <if test="activityDayDistnct != null  and activityDayDistnct != ''"> and activity_day_distnct = #{activityDayDistnct}</if>
             <if test="dieseloilDiscountAmt != null  and dieseloilDiscountAmt != ''"> and dieseloil_discount_amt = #{dieseloilDiscountAmt}</if>
             <if test="vipDiscountyPlus != null  and vipDiscountyPlus != ''"> and vip_discounty_plus = #{vipDiscountyPlus}</if>
             <if test="couponPlus != null  and couponPlus != ''"> and coupon_plus = #{couponPlus}</if>
@@ -69,6 +83,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null">station_id,</if>
             <if test="stationName != null">station_name,</if>
             <if test="status != null">status,</if>
+            <if test="activityDaySetting != null  ">activity_day_setting,</if>
+            <if test="activityDayType != null  ">activity_day_type,</if>
+            <if test="activityDayWeek != null ">activity_day_week,</if>
+            <if test="activityDayMonth != null ">activity_day_month,</if>
+            <if test="activityDayDate != null">activity_day_date,</if>
+            <if test="activityDayTime != null">activity_day_time,</if>
+            <if test="activityDayDistnct != null">activity_day_distnct,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="grade != null">#{grade},</if>
@@ -83,6 +104,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null">#{stationId},</if>
             <if test="stationName != null">#{stationName},</if>
             <if test="status != null">#{status},</if>
+            <if test="activityDaySetting != null  ">#{activityDaySetting},</if>
+            <if test="activityDayType != null  ">#{activityDayType},</if>
+            <if test="activityDayWeek != null ">#{activityDayWeek},</if>
+            <if test="activityDayMonth != null ">#{activityDayMonth},</if>
+            <if test="activityDayDate != null">#{activityDayDate},</if>
+            <if test="activityDayTime != null">#{activityDayTime},</if>
+            <if test="activityDayDistnct != null">#{activityDayDistnct},</if>
          </trim>
     </insert>
 
@@ -101,6 +129,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null">station_id = #{stationId},</if>
             <if test="stationName != null">station_name = #{stationName},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="activityDaySetting != null  ">activityDaySetting = #{activityDaySetting},</if>
+            <if test="activityDayType != null  ">activityDayType= #{activityDayType},</if>
+            <if test="activityDayWeek != null ">activityDayWeek = #{activityDayWeek},</if>
+            <if test="activityDayMonth != null "> activityDayMonth = #{activityDayMonth},</if>
+            <if test="activityDayDate != null">activityDayDate = #{activityDayDate},</if>
+            <if test="activityDayTime != null">activityDayTime = #{activityDayTime},</if>
+            <if test="activityDayDistnct != null">activityDayDistnct = #{activityDayDistnct},</if>
         </trim>
         where id = #{id}
     </update>