update

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

@@ -2,7 +2,9 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.VipGroupActivityTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 对应数据库表(vip_group_activity):
@@ -15,6 +17,12 @@ public class VipGroupActivity {
 	@ApiModelProperty(value = "活动名称")
 	private String name;
 
+	@ApiModelProperty(value = "活动类型，课程或者会员,0课程，1会员")
+	private Integer activityType = 0;
+
+	@ApiModelProperty(value = "单节课时长")
+	private Integer singleCourseTime;
+
 	@ApiModelProperty(value = "活动描述\n")
 	private String description;
 
@@ -39,6 +47,30 @@ public class VipGroupActivity {
 	@ApiModelProperty(value = "活动类型（基础活动、折扣、赠送课时）")
 	private VipGroupActivityTypeEnum type;
 
+	@ApiModelProperty(value = "折扣）")
+	private BigDecimal discount = new BigDecimal(100);
+
+	@ApiModelProperty(value = "满赠达标课时:-1：没有满赠）")
+	private Integer fullMinusCourseTimes = -1;
+
+	@ApiModelProperty(value = "赠课类型")
+	private String giveCourseType;
+
+	@ApiModelProperty(value = "课类型")
+	private String courseType;
+
+	@ApiModelProperty(value = "赠课形式")
+	private String giveCategoryId;
+
+	@ApiModelProperty(value = "赠课数量")
+	private Integer giveCourseNum = 0;
+
+	@ApiModelProperty(value = "会员编号")
+	private Integer memberRankId;
+
+	@ApiModelProperty(value = "会员时长")
+	private Integer memberTime;
+
 	@ApiModelProperty(value = "活动变量1")
 	private String attribute1;
 
@@ -86,15 +118,23 @@ public class VipGroupActivity {
 	@ApiModelProperty(value = "最多可排课数量")
 	private Integer maxCourseNum;
 
-	@ApiModelProperty(value = "每位学员最大使用次数")
+	@ApiModelProperty(value = "每位学员最大购买次数")
 	private Integer studentMaxUsedTimes;
 
-	@ApiModelProperty(value = "适用学生类型:-1：所有；0：老用户；1：新用户")
+	@ApiModelProperty(value = "适用学生类型:-1：所有；0：老用户；1：新用户，2会员，3非会员")
 	private Integer  applyToStudentType = -1;
 
 	@ApiModelProperty(value = "课程可调整方向：0双向可调，1禁止线上到线下，2禁止线下到线上，3双向不可调")
 	private Integer allowOnlineToOffline = 0;
 
+	public String getCourseType() {
+		return courseType;
+	}
+
+	public void setCourseType(String courseType) {
+		this.courseType = courseType;
+	}
+
 	public Integer getAllowOnlineToOffline() {
 		return allowOnlineToOffline;
 	}
@@ -103,28 +143,52 @@ public class VipGroupActivity {
 		this.allowOnlineToOffline = allowOnlineToOffline;
 	}
 
-	public Integer getApplyToStudentType() {
-		return applyToStudentType;
+	public String getAttribute1() {
+		return attribute1;
 	}
 
-	public void setApplyToStudentType(Integer applyToStudentType) {
-		this.applyToStudentType = applyToStudentType;
+	public void setAttribute1(String attribute1) {
+		this.attribute1 = attribute1;
 	}
 
-	public Integer getMinCourseNum() {
-		return minCourseNum;
+	public String getAttribute2() {
+		return attribute2;
 	}
 
-	public void setMinCourseNum(Integer minCourseNum) {
-		this.minCourseNum = minCourseNum;
+	public void setAttribute2(String attribute2) {
+		this.attribute2 = attribute2;
 	}
 
-	public Integer getMaxCourseNum() {
-		return maxCourseNum;
+	public String getAttribute3() {
+		return attribute3;
 	}
 
-	public void setMaxCourseNum(Integer maxCourseNum) {
-		this.maxCourseNum = maxCourseNum;
+	public void setAttribute3(String attribute3) {
+		this.attribute3 = attribute3;
+	}
+
+	public String getSalaryReadonlyFlag() {
+		return salaryReadonlyFlag;
+	}
+
+	public void setSalaryReadonlyFlag(String salaryReadonlyFlag) {
+		this.salaryReadonlyFlag = salaryReadonlyFlag;
+	}
+
+	public String getPaymentReadonlyFlag() {
+		return paymentReadonlyFlag;
+	}
+
+	public void setPaymentReadonlyFlag(String paymentReadonlyFlag) {
+		this.paymentReadonlyFlag = paymentReadonlyFlag;
+	}
+
+	public String getGiveClassPaySalaryFlag() {
+		return giveClassPaySalaryFlag;
+	}
+
+	public void setGiveClassPaySalaryFlag(String giveClassPaySalaryFlag) {
+		this.giveClassPaySalaryFlag = giveClassPaySalaryFlag;
 	}
 
 	public Integer getOnlineClassJoinGradientRewards() {
@@ -143,174 +207,190 @@ public class VipGroupActivity {
 		this.offlineClassJoinGradientRewards = offlineClassJoinGradientRewards;
 	}
 
-	public String getPaymentReadonlyFlag() {
-		return paymentReadonlyFlag;
+	public Integer getId() {
+		return id;
 	}
 
-	public void setPaymentReadonlyFlag(String paymentReadonlyFlag) {
-		this.paymentReadonlyFlag = paymentReadonlyFlag;
+	public void setId(Integer id) {
+		this.id = id;
 	}
 
-	public Integer getEnable() {
-		return enable;
+	public String getName() {
+		return name;
 	}
 
-	public void setEnable(Integer enable) {
-		this.enable = enable;
+	public void setName(String name) {
+		this.name = name;
 	}
 
-	public String getVipGroupCategoryNames() {
-		return vipGroupCategoryNames;
+	public Integer getActivityType() {
+		return activityType;
 	}
 
-	public void setVipGroupCategoryNames(String vipGroupCategoryNames) {
-		this.vipGroupCategoryNames = vipGroupCategoryNames;
+	public void setActivityType(Integer activityType) {
+		this.activityType = activityType;
 	}
 
-	public void setId(Integer id){
-		this.id = id;
+	public VipGroupActivityTypeEnum getType() {
+		return type;
 	}
-	
-	public Integer getId(){
-		return this.id;
+
+	public void setType(VipGroupActivityTypeEnum type) {
+		this.type = type;
 	}
-			
-	public void setName(String name){
-		this.name = name;
+
+	public Integer getSingleCourseTime() {
+		return singleCourseTime;
 	}
-	
-	public String getName(){
-		return this.name;
+
+	public void setSingleCourseTime(Integer singleCourseTime) {
+		this.singleCourseTime = singleCourseTime;
 	}
-			
-	public void setDescription(String description){
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
 		this.description = description;
 	}
-	
-	public String getDescription(){
-		return this.description;
+
+	public String getVipGroupCategoryIdList() {
+		return vipGroupCategoryIdList;
 	}
-			
-	public void setVipGroupCategoryIdList(String vipGroupCategoryIdList){
+
+	public void setVipGroupCategoryIdList(String vipGroupCategoryIdList) {
 		this.vipGroupCategoryIdList = vipGroupCategoryIdList;
 	}
-	
-	public String getVipGroupCategoryIdList(){
-		return this.vipGroupCategoryIdList;
+
+	public Date getStartTime() {
+		return startTime;
 	}
-			
-	public void setStartTime(java.util.Date startTime){
+
+	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
 	}
-	
-	public java.util.Date getStartTime(){
-		return this.startTime;
+
+	public Date getEndTime() {
+		return endTime;
 	}
-			
-	public void setEndTime(java.util.Date endTime){
+
+	public void setEndTime(Date endTime) {
 		this.endTime = endTime;
 	}
-	
-	public java.util.Date getEndTime(){
-		return this.endTime;
+
+	public String getOrganId() {
+		return organId;
 	}
-			
-	public void setOrganId(String organId){
+
+	public void setOrganId(String organId) {
 		this.organId = organId;
 	}
-	
-	public String getOrganId(){
-		return this.organId;
+
+	public Date getCoursesStartTime() {
+		return coursesStartTime;
 	}
-			
-	public void setCoursesStartTime(java.util.Date coursesStartTime){
+
+	public void setCoursesStartTime(Date coursesStartTime) {
 		this.coursesStartTime = coursesStartTime;
 	}
-	
-	public java.util.Date getCoursesStartTime(){
-		return this.coursesStartTime;
+
+	public Date getCoursesEndTime() {
+		return coursesEndTime;
 	}
-			
-	public void setCoursesEndTime(java.util.Date coursesEndTime){
+
+	public void setCoursesEndTime(Date coursesEndTime) {
 		this.coursesEndTime = coursesEndTime;
 	}
-	
-	public java.util.Date getCoursesEndTime(){
-		return this.coursesEndTime;
+
+	public BigDecimal getDiscount() {
+		return discount;
 	}
 
-	public VipGroupActivityTypeEnum getType() {
-		return type;
+	public void setDiscount(BigDecimal discount) {
+		this.discount = discount;
 	}
 
-	public void setType(VipGroupActivityTypeEnum type) {
-		this.type = type;
+	public Integer getFullMinusCourseTimes() {
+		return fullMinusCourseTimes;
 	}
 
-	public void setAttribute1(String attribute1){
-		this.attribute1 = attribute1;
+	public void setFullMinusCourseTimes(Integer fullMinusCourseTimes) {
+		this.fullMinusCourseTimes = fullMinusCourseTimes;
 	}
-	
-	public String getAttribute1(){
-		return this.attribute1;
+
+	public String getGiveCourseType() {
+		return giveCourseType;
 	}
-			
-	public void setAttribute2(String attribute2){
-		this.attribute2 = attribute2;
+
+	public void setGiveCourseType(String giveCourseType) {
+		this.giveCourseType = giveCourseType;
 	}
-	
-	public String getAttribute2(){
-		return this.attribute2;
+
+	public String getGiveCategoryId() {
+		return giveCategoryId;
 	}
-			
-	public void setAttribute3(String attribute3){
-		this.attribute3 = attribute3;
+
+	public void setGiveCategoryId(String giveCategoryId) {
+		this.giveCategoryId = giveCategoryId;
 	}
-	
-	public String getAttribute3(){
-		return this.attribute3;
+
+	public Integer getGiveCourseNum() {
+		return giveCourseNum;
 	}
-			
-	public void setSalaryReadonlyFlag(String salaryReadonlyFlag){
-		this.salaryReadonlyFlag = salaryReadonlyFlag;
+
+	public void setGiveCourseNum(Integer giveCourseNum) {
+		this.giveCourseNum = giveCourseNum;
 	}
-	
-	public String getSalaryReadonlyFlag(){
-		return this.salaryReadonlyFlag;
+
+	public Integer getMemberRankId() {
+		return memberRankId;
 	}
-			
-	public void setGiveClassPaySalaryFlag(String giveClassPaySalaryFlag){
-		this.giveClassPaySalaryFlag = giveClassPaySalaryFlag;
+
+	public void setMemberRankId(Integer memberRankId) {
+		this.memberRankId = memberRankId;
 	}
-	
-	public String getGiveClassPaySalaryFlag(){
-		return this.giveClassPaySalaryFlag;
+
+	public Integer getMemberTime() {
+		return memberTime;
 	}
-			
-	public void setCreateTime(java.util.Date createTime){
+
+	public void setMemberTime(Integer memberTime) {
+		this.memberTime = memberTime;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
+
+	public Date getUpdateTime() {
+		return updateTime;
 	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
+
+	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
+
+	public String getSalarySettlementJson() {
+		return salarySettlementJson;
 	}
-			
-	public void setSalarySettlementJson(String salarySettlementJson){
+
+	public void setSalarySettlementJson(String salarySettlementJson) {
 		this.salarySettlementJson = salarySettlementJson;
 	}
-	
-	public String getSalarySettlementJson(){
-		return this.salarySettlementJson;
+
+	public String getVipGroupCategoryNames() {
+		return vipGroupCategoryNames;
+	}
+
+	public void setVipGroupCategoryNames(String vipGroupCategoryNames) {
+		this.vipGroupCategoryNames = vipGroupCategoryNames;
 	}
-			
+
 	public Boolean getDelFlag() {
 		return delFlag;
 	}
@@ -319,6 +399,30 @@ public class VipGroupActivity {
 		this.delFlag = delFlag;
 	}
 
+	public Integer getEnable() {
+		return enable;
+	}
+
+	public void setEnable(Integer enable) {
+		this.enable = enable;
+	}
+
+	public Integer getMinCourseNum() {
+		return minCourseNum;
+	}
+
+	public void setMinCourseNum(Integer minCourseNum) {
+		this.minCourseNum = minCourseNum;
+	}
+
+	public Integer getMaxCourseNum() {
+		return maxCourseNum;
+	}
+
+	public void setMaxCourseNum(Integer maxCourseNum) {
+		this.maxCourseNum = maxCourseNum;
+	}
+
 	public Integer getStudentMaxUsedTimes() {
 		return studentMaxUsedTimes;
 	}
@@ -327,9 +431,11 @@ public class VipGroupActivity {
 		this.studentMaxUsedTimes = studentMaxUsedTimes;
 	}
 
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
+	public Integer getApplyToStudentType() {
+		return applyToStudentType;
 	}
 
-}
+	public void setApplyToStudentType(Integer applyToStudentType) {
+		this.applyToStudentType = applyToStudentType;
+	}
+}

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

@@ -36,6 +36,16 @@
 		<result property="studentMaxUsedTimes" column="student_max_used_times_"/>
 		<result property="applyToStudentType" column="apply_to_student_type_"/>
 		<result property="allowOnlineToOffline" column="allow_online_to_offline_"/>
+		<result property="giveCategoryId" column="give_category_id_"/>
+		<result property="singleCourseTime" column="single_course_time_"/>
+		<result property="discount" column="discount_"/>
+		<result property="fullMinusCourseTimes" column="full_minus_course_times_"/>
+		<result property="giveCourseType" column="give_course_type_"/>
+		<result property="giveCourseNum" column="give_course_num_"/>
+		<result property="memberRankId" column="member_rank_id_"/>
+		<result property="memberTime" column="member_time_"/>
+		<result property="courseType" column="course_type_"/>
+		<result property="activityType" column="activity_type_"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -50,13 +60,17 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.VipGroupActivity" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO vip_group_activity (id_,name_,description_,vip_group_category_id_list_,start_time_,end_time_,organ_id_,courses_start_time_,courses_end_time_,type_,
+		INSERT INTO vip_group_activity (name_,description_,vip_group_category_id_list_,start_time_,end_time_,organ_id_,courses_start_time_,courses_end_time_,type_,
 		                                attribute1_,attribute2_,attribute3_,salary_readonly_flag_,give_class_pay_salary_flag_,create_time_,update_time_,salary_settlement_json_,del_flag_,
 		                                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_)
-		VALUES(#{id},#{name},#{description},#{vipGroupCategoryIdList},#{startTime},#{endTime},#{organId},#{coursesStartTime},#{coursesEndTime},#{type},#{attribute1},#{attribute2},#{attribute3},
+										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_,course_type_,activity_type_)
+		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})
+		       #{offlineClassJoinGradientRewards},#{minCourseNum},#{maxCourseNum},#{studentMaxUsedTimes},#{applyToStudentType},#{allowOnlineToOffline},
+			   #{singleCourseTime},#{discount},#{fullMinusCourseTimes},#{giveCourseType},#{giveCategoryId},give_course_num_
+				  ,member_rank_id_,member_time_,course_type_,activity_type_)
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->