修改营销管理

yijia-market/src/main/java/com/yijia/market/controller/MarkertPlanController.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.yijia.common.core.domain.entity.SysDept;
 import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.DateUtils;
 import com.yijia.common.utils.SecurityUtils;
 import com.yijia.system.service.ISysDeptService;
 import com.yijia.system.service.ISysUserService;
@@ -55,6 +56,7 @@ public class MarkertPlanController extends BaseController
             markertPlan.setStationIdList(list);
             markertPlan.setStationId(null);
         }
+        markertPlan.setStatus("0");
         startPage();
         List<MarkertPlan> planList = markertPlanService.selectMarkertPlanList(markertPlan);
         return getDataTable(planList);
@@ -75,6 +77,7 @@ public class MarkertPlanController extends BaseController
             markertPlan.setStationIdList(list);
             markertPlan.setStationId(null);
         }
+        markertPlan.setStatus("0");
         List<MarkertPlan> planList = markertPlanService.selectMarkertPlanList(markertPlan);
         ExcelUtil<MarkertPlan> util = new ExcelUtil<MarkertPlan>(MarkertPlan.class);
         return util.exportExcel(planList, "plan");
@@ -98,7 +101,9 @@ public class MarkertPlanController extends BaseController
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
         markertPlan.setStationId(currentUser.getUser().getDeptId());
-        markertPlan.setStationName(currentUser.getUser().getDept().getDeptName());
+        markertPlan.setCreateBy(currentUser.getUser().getUserId()+"");
+        markertPlan.setCreateTime(DateUtils.getNowDate());
+        markertPlan.setStatus("0");
         return toAjax(markertPlanService.insertMarkertPlan(markertPlan));
     }
 
@@ -111,7 +116,9 @@ public class MarkertPlanController extends BaseController
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
         markertPlan.setStationId(currentUser.getUser().getDeptId());
-        markertPlan.setStationName(currentUser.getUser().getDept().getDeptName());
+        markertPlan.setUpdateBy(currentUser.getUser().getUserId()+"");
+        markertPlan.setUpdateTime(DateUtils.getNowDate());
+        markertPlan.setStatus("0");
         return toAjax(markertPlanService.updateMarkertPlan(markertPlan));
     }
 
@@ -120,8 +127,16 @@ public class MarkertPlanController extends BaseController
      */
     @Log(title = "营销方案", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
+    public AjaxResult remove(@PathVariable Long ids)
     {
-        return toAjax(markertPlanService.deleteMarkertPlanByIds(ids));
+        int i =0;
+        MarkertPlan markertPlan =new MarkertPlan();
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        markertPlan.setUpdateBy(currentUser.getUser().getUserId()+"");
+        markertPlan.setUpdateTime(DateUtils.getNowDate());
+        markertPlan.setStatus("1");
+        markertPlan.setId(ids);
+        i=markertPlanService.updateMarkertPlan(markertPlan);
+        return toAjax(i);
     }
 }

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

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * 营销方案对象 markert_plan
- * 
+ *
  * @author yijia
  * @date 2021-01-26
  */
@@ -35,26 +35,6 @@ public class MarkertPlan extends BaseEntity
     /** 优惠金额 */
     @Excel(name = "优惠金额")
     private String gasoilDiscountAmt;
-    /** 会员日活动设置：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;
 
     /** 会员优惠是否叠加 */
     @Excel(name = "会员优惠是否叠加")
@@ -81,65 +61,8 @@ public class MarkertPlan extends BaseEntity
     private String stationName;
 
     /** 状态（1.在用状态，2，删除） */
-    @Excel(name = "状态", readConverterExp = "1=.在用状态，2，删除")
+    @Excel(name = "状态", readConverterExp = "0=.在用状态，1，删除")
     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;
-    }
-
     /**
      * 根据用户所属组织，平台，集团，油站查询条件
      */
@@ -153,120 +76,111 @@ public class MarkertPlan extends BaseEntity
         this.stationIdList = stationIdList;
     }
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setGrade(String grade) 
+    public void setGrade(String grade)
     {
         this.grade = grade;
     }
 
-    public String getGrade() 
+    public String getGrade()
     {
         return grade;
     }
-    public void setDiscountTerm(String discountTerm) 
+    public void setDiscountTerm(String discountTerm)
     {
         this.discountTerm = discountTerm;
     }
 
-    public String getDiscountTerm() 
+    public String getDiscountTerm()
     {
         return discountTerm;
     }
-    public void setDiscountAmt(String discountAmt) 
+    public void setDiscountAmt(String discountAmt)
     {
         this.discountAmt = discountAmt;
     }
 
-    public String getDiscountAmt() 
+    public String getDiscountAmt()
     {
         return discountAmt;
     }
-    public void setGasoilDiscountAmt(String gasoilDiscountAmt) 
+    public void setGasoilDiscountAmt(String gasoilDiscountAmt)
     {
         this.gasoilDiscountAmt = gasoilDiscountAmt;
     }
 
-    public String getGasoilDiscountAmt() 
+    public String getGasoilDiscountAmt()
     {
         return gasoilDiscountAmt;
     }
-    public void setDieseloilDiscountAmt(String dieseloilDiscountAmt) 
-    {
-        this.dieseloilDiscountAmt = dieseloilDiscountAmt;
-    }
-
-    public String getDieseloilDiscountAmt() 
-    {
-        return dieseloilDiscountAmt;
-    }
-    public void setVipDiscountyPlus(String vipDiscountyPlus) 
+    public void setVipDiscountyPlus(String vipDiscountyPlus)
     {
         this.vipDiscountyPlus = vipDiscountyPlus;
     }
 
-    public String getVipDiscountyPlus() 
+    public String getVipDiscountyPlus()
     {
         return vipDiscountyPlus;
     }
-    public void setCouponPlus(String couponPlus) 
+    public void setCouponPlus(String couponPlus)
     {
         this.couponPlus = couponPlus;
     }
 
-    public String getCouponPlus() 
+    public String getCouponPlus()
     {
         return couponPlus;
     }
-    public void setDiscountPlanType(String discountPlanType) 
+    public void setDiscountPlanType(String discountPlanType)
     {
         this.discountPlanType = discountPlanType;
     }
 
-    public String getDiscountPlanType() 
+    public String getDiscountPlanType()
     {
         return discountPlanType;
     }
-    public void setOilName(String oilName) 
+    public void setOilName(String oilName)
     {
         this.oilName = oilName;
     }
 
-    public String getOilName() 
+    public String getOilName()
     {
         return oilName;
     }
-    public void setStationId(Long stationId) 
+    public void setStationId(Long stationId)
     {
         this.stationId = stationId;
     }
 
-    public Long getStationId() 
+    public Long getStationId()
     {
         return stationId;
     }
-    public void setStationName(String stationName) 
+    public void setStationName(String stationName)
     {
         this.stationName = stationName;
     }
 
-    public String getStationName() 
+    public String getStationName()
     {
         return stationName;
     }
-    public void setStatus(String status) 
+    public void setStatus(String status)
     {
         this.status = status;
     }
 
-    public String getStatus() 
+    public String getStatus()
     {
         return status;
     }
@@ -279,7 +193,6 @@ public class MarkertPlan extends BaseEntity
             .append("discountTerm", getDiscountTerm())
             .append("discountAmt", getDiscountAmt())
             .append("gasoilDiscountAmt", getGasoilDiscountAmt())
-            .append("dieseloilDiscountAmt", getDieseloilDiscountAmt())
             .append("vipDiscountyPlus", getVipDiscountyPlus())
             .append("couponPlus", getCouponPlus())
             .append("discountPlanType", getDiscountPlanType())

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

@@ -3,21 +3,13 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yijia.market.mapper.MarkertPlanMapper">
-    
+
     <resultMap type="MarkertPlan" id="MarkertPlanResult">
         <result property="id"    column="id"    />
         <result property="grade"    column="grade"    />
         <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"    />
         <result property="discountPlanType"    column="discount_plan_type"    />
@@ -25,34 +17,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stationId"    column="station_id"    />
         <result property="stationName"    column="station_name"    />
         <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"  />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectMarkertPlanVo">
-        select id, grade, discount_term, discount_amt, gasoil_discount_amt, dieseloil_discount_amt, vip_discounty_plus, coupon_plus, discount_plan_type, oil_name, station_id, station_name, status from markert_plan
+        select id, grade, discount_term, discount_amt, gasoil_discount_amt, dieseloil_discount_amt, vip_discounty_plus, coupon_plus, discount_plan_type,
+         oil_name, station_id, station_name, status,create_by,create_time,update_by,update_time
+          from markert_plan
     </sql>
 
     <select id="selectMarkertPlanList" parameterType="MarkertPlan" resultMap="MarkertPlanResult">
-        <include refid="selectMarkertPlanVo"/>
-        <where>  
-            <if test="grade != null  and grade != ''"> and grade = #{grade}</if>
-            <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>
-            <if test="discountPlanType != null  and discountPlanType != ''"> and discount_plan_type = #{discountPlanType}</if>
-            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
-            <if test="stationId != null "> and station_id = #{stationId}</if>
-            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+        select  p.id,  p.grade, p.discount_term,  p.discount_amt,  p.gasoil_discount_amt, p.vip_discounty_plus, p.coupon_plus, p.discount_plan_type,
+        p.oil_name, station_id, p.status,p.create_by,p.create_time,p.update_by,p.update_time,d.dept_name as station_name
+        from markert_plan p join sys_dept d on  d.dept_id =p.station_id
+        <where>
+            <if test="grade != null  and grade != ''"> and p.grade = #{grade}</if>
+            <if test="discountTerm != null  and discountTerm != ''"> and p.discount_term = #{discountTerm}</if>
+            <if test="discountAmt != null  and discountAmt != ''"> and p.discount_amt = #{discountAmt}</if>
+            <if test="gasoilDiscountAmt != null  and gasoilDiscountAmt != ''"> and p.gasoil_discount_amt = #{gasoilDiscountAmt}</if>
+            <if test="vipDiscountyPlus != null  and vipDiscountyPlus != ''"> and p.vip_discounty_plus = #{vipDiscountyPlus}</if>
+            <if test="couponPlus != null  and couponPlus != ''"> and p.coupon_plus = #{couponPlus}</if>
+            <if test="discountPlanType != null  and discountPlanType != ''"> and p.discount_plan_type = #{discountPlanType}</if>
+            <if test="oilName != null  and oilName != ''"> and p.oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="stationId != null "> and p.station_id = #{stationId}</if>
+            <if test="status != null  and status != ''"> and p.status = #{status}</if>
             <if test="stationIdList != null ">
                 and station_id in
                 <foreach item="item" index="index" collection="stationIdList"
@@ -62,12 +53,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
     </select>
-    
+
     <select id="selectMarkertPlanById" parameterType="Long" resultMap="MarkertPlanResult">
-        <include refid="selectMarkertPlanVo"/>
+          select  p.id,  p.grade, p.discount_term,  p.discount_amt,  p.gasoil_discount_amt, p.vip_discounty_plus, p.coupon_plus, p.discount_plan_type,
+          p.oil_name, station_id, p.status,p.create_by,p.create_time,p.update_by,p.update_time,d.dept_name as station_name
+          from markert_plan p join sys_dept d on  d.dept_id =p.station_id
         where id = #{id}
     </select>
-        
+
     <insert id="insertMarkertPlan" parameterType="MarkertPlan" useGeneratedKeys="true" keyProperty="id">
         insert into markert_plan
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -75,42 +68,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="discountTerm != null">discount_term,</if>
             <if test="discountAmt != null">discount_amt,</if>
             <if test="gasoilDiscountAmt != null">gasoil_discount_amt,</if>
-            <if test="dieseloilDiscountAmt != null">dieseloil_discount_amt,</if>
             <if test="vipDiscountyPlus != null">vip_discounty_plus,</if>
             <if test="couponPlus != null">coupon_plus,</if>
             <if test="discountPlanType != null">discount_plan_type,</if>
             <if test="oilName != null">oil_name,</if>
             <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>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="grade != null">#{grade},</if>
             <if test="discountTerm != null">#{discountTerm},</if>
             <if test="discountAmt != null">#{discountAmt},</if>
             <if test="gasoilDiscountAmt != null">#{gasoilDiscountAmt},</if>
-            <if test="dieseloilDiscountAmt != null">#{dieseloilDiscountAmt},</if>
             <if test="vipDiscountyPlus != null">#{vipDiscountyPlus},</if>
             <if test="couponPlus != null">#{couponPlus},</if>
             <if test="discountPlanType != null">#{discountPlanType},</if>
             <if test="oilName != null">#{oilName},</if>
             <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>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
          </trim>
     </insert>
 
@@ -121,21 +104,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="discountTerm != null">discount_term = #{discountTerm},</if>
             <if test="discountAmt != null">discount_amt = #{discountAmt},</if>
             <if test="gasoilDiscountAmt != null">gasoil_discount_amt = #{gasoilDiscountAmt},</if>
-            <if test="dieseloilDiscountAmt != null">dieseloil_discount_amt = #{dieseloilDiscountAmt},</if>
             <if test="vipDiscountyPlus != null">vip_discounty_plus = #{vipDiscountyPlus},</if>
             <if test="couponPlus != null">coupon_plus = #{couponPlus},</if>
             <if test="discountPlanType != null">discount_plan_type = #{discountPlanType},</if>
             <if test="oilName != null">oil_name = #{oilName},</if>
             <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>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
         where id = #{id}
     </update>
@@ -145,10 +123,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteMarkertPlanByIds" parameterType="String">
-        delete from markert_plan where id in 
+        delete from markert_plan where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-    
-</mapper>
+
+</mapper>