活动排课

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MarketActivityDao.java

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.MarketActivity;
+
+public interface MarketActivityDao extends BaseDAO<Integer, MarketActivity> {
+
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MarketActivity.java

@@ -0,0 +1,59 @@
+package com.ym.mec.biz.dal.entity;
+
+import java.util.Date;
+
+/**
+ * 对应数据库表(market_activity):
+ */
+public class MarketActivity {
+
+	private Integer id;
+
+	private String name;
+
+	private String activityIds;
+
+	private Date createTime;
+
+	private Date updateTime;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getActivityIds() {
+		return activityIds;
+	}
+
+	public void setActivityIds(String activityIds) {
+		this.activityIds = activityIds;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroupActivity.java

@@ -80,6 +80,9 @@ public class VipGroupActivity {
 	@ApiModelProperty(value = "赠送会员时长")
 	private Integer giveMemberTime;
 
+	@ApiModelProperty(value = "是否充值到余额")
+	private boolean isPayToBalance = true;
+
 	@ApiModelProperty(value = "活动变量1")
 	private String attribute1;
 
@@ -136,6 +139,14 @@ public class VipGroupActivity {
 	@ApiModelProperty(value = "课程可调整方向：0双向可调，1禁止线上到线下，2禁止线下到线上，3双向不可调")
 	private Integer allowOnlineToOffline = 0;
 
+	public boolean isPayToBalance() {
+		return isPayToBalance;
+	}
+
+	public void setPayToBalance(boolean payToBalance) {
+		isPayToBalance = payToBalance;
+	}
+
 	public Integer getGiveMemberRankId() {
 		return giveMemberRankId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/MarketActivityService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.MarketActivity;
+import com.ym.mec.common.service.BaseService;
+
+public interface MarketActivityService extends BaseService<Integer, MarketActivity> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MarketActivityServiceImpl.java

@@ -0,0 +1,22 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.dao.MarketActivityDao;
+import com.ym.mec.biz.dal.entity.MarketActivity;
+import com.ym.mec.biz.service.MarketActivityService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MarketActivityServiceImpl extends BaseServiceImpl<Integer, MarketActivity>  implements MarketActivityService {
+	
+	@Autowired
+	private MarketActivityDao marketActivityDao;
+
+	@Override
+	public BaseDAO<Integer, MarketActivity> getDAO() {
+		return marketActivityDao;
+	}
+	
+}

mec-biz/src/main/resources/config/mybatis/MarketActivityMapper.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.MarketActivityDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.MarketActivity" id="MarketActivity">
+		<result column="id_" property="id" />
+		<result column="name_" property="name" />
+		<result column="activity_ids_" property="activityIds" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="MarketActivity" >
+		SELECT * FROM market_activity WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="MarketActivity">
+		SELECT * FROM market_activity ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MarketActivity" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO market_activity (name_,activity_ids_,create_time_,update_time_)
+		VALUES(#{name},#{activityIds},#{createTime},#{updateTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MarketActivity">
+		UPDATE market_activity <set>
+		<if test="name != null">
+		name_ = #{name},
+		</if>
+		<if test="activityIds != null">
+		activity_ids_ = #{activityIds},
+		</if>
+		update_time_ = NOW()
+	</set> WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM market_activity WHERE id_ = #{id} 
+	</delete>
+	<sql id="queryPageSql">
+		<where>
+			1=1
+			<if test="search != null and search != ''">
+				AND (name_ LIKE CONCAT('%',#{search},'%') OR id_ = #{search})
+			</if>
+		</where>
+	</sql>
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="MarketActivity" parameterType="map">
+		SELECT * FROM market_activity
+		<include refid="queryPageSql"/>
+		ORDER BY id_
+		<include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM market_activity
+		<include refid="queryPageSql"/>
+	</select>
+</mapper>

mec-biz/src/main/resources/config/mybatis/VipGroupActivityMapper.xml

@@ -49,6 +49,7 @@
 		<result property="courseType" column="course_type_"/>
 		<result property="activityType" column="activity_type_"/>
 		<result property="giveSingleCourseTime" column="give_sign_course_time_"/>
+		<result property="payToBalance" column="is_pay_to_balance_"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -68,18 +69,22 @@
 		                                payment_readonly_flag_,online_class_join_gradient_rewards_,offline_class_join_gradient_rewards_,min_course_num_,max_course_num_,
 										student_max_used_times_, apply_to_student_type_,allow_online_to_offline_,
 										single_course_time_,discount_,full_minus_course_times_,give_course_type_,give_category_id_,give_course_num_
-										,member_rank_id_,member_time_,give_member_rank_id_,give_member_time_,course_type_,activity_type_,give_sign_course_time_)
+										,member_rank_id_,member_time_,give_member_rank_id_,give_member_time_,course_type_,
+		                                activity_type_,give_sign_course_time_,is_pay_to_balance_)
 		VALUES(#{name},#{description},#{vipGroupCategoryIdList},#{startTime},#{endTime},#{organId},#{coursesStartTime},#{coursesEndTime},#{type},#{attribute1},#{attribute2},#{attribute3},
 		       #{salaryReadonlyFlag},#{giveClassPaySalaryFlag},now(),now(),#{salarySettlementJson},#{delFlag},#{paymentReadonlyFlag},#{onlineClassJoinGradientRewards},
 		       #{offlineClassJoinGradientRewards},#{minCourseNum},#{maxCourseNum},#{studentMaxUsedTimes},#{applyToStudentType},#{allowOnlineToOffline},
 			   #{singleCourseTime},#{discount},#{fullMinusCourseTimes},#{giveCourseType},#{giveCategoryId},#{giveCourseNum}
-				  ,#{memberRankId},#{memberTime},#{giveMemberRankId},#{giveMemberTime},#{courseType},#{activityType},#{giveSingleCourseTime})
+				  ,#{memberRankId},#{memberTime},#{giveMemberRankId},#{giveMemberTime},#{courseType},#{activityType},#{giveSingleCourseTime},#{isPayToBalance})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.VipGroupActivity">
 		UPDATE vip_group_activity
 		<set>
+			<if test="is_pay_to_balance_ != null">
+				is_pay_to_balance_ = #{isPayToBalance},
+			</if>
 			<if test="give_sign_course_time_ != null">
 				give_sign_course_time_ = #{giveSingleCourseTime},
 			</if>

mec-web/src/main/java/com/ym/mec/web/controller/MarketActivityController.java

@@ -0,0 +1,56 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.entity.MarketActivity;
+import com.ym.mec.biz.service.MarketActivityService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("marketActivity")
+@Api(tags = "营销活动")
+@RestController
+public class MarketActivityController extends BaseController {
+
+	@Autowired
+	private MarketActivityService marketActivityService;
+
+	@ApiOperation("新增")
+	@RequestMapping(value = "add")
+	@PreAuthorize("@pcs.hasPermissions('marketActivity/add')")
+	public Object add(MarketActivity marketActivity) {
+		return succeed(marketActivityService.insert(marketActivity));
+	}
+
+	@ApiOperation("删除")
+	@RequestMapping(value = "del")
+	@PreAuthorize("@pcs.hasPermissions('marketActivity/del')")
+	public Object del(Integer id) {
+		return succeed(marketActivityService.delete(id));
+	}
+
+	@ApiOperation("修改")
+	@RequestMapping(value = "update")
+	@PreAuthorize("@pcs.hasPermissions('marketActivity/update')")
+	public Object update(MarketActivity marketActivity) {
+		return succeed(marketActivityService.update(marketActivity));
+	}
+
+	@ApiOperation("查询")
+	@RequestMapping(value = "get")
+	@PreAuthorize("@pcs.hasPermissions('marketActivity/get')")
+	public Object get(Integer id) {
+		return succeed(marketActivityService.get(id));
+	}
+
+	@ApiOperation("分页查询")
+	@RequestMapping(value = "queryPage")
+	@PreAuthorize("@pcs.hasPermissions('marketActivity/queryPage')")
+	public Object queryPage(QueryInfo queryInfo) {
+		return succeed(marketActivityService.queryPage(queryInfo));
+	}
+}