update

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

@@ -21,7 +21,10 @@ public class VipGroupActivity {
 	private Integer activityType = 0;
 
 	@ApiModelProperty(value = "单节课时长")
-	private Integer singleCourseTime;
+	private Integer singleCourseTime = 45;
+
+	@ApiModelProperty(value = "单节课时长")
+	private Integer giveSingleCourseTime = 45;
 
 	@ApiModelProperty(value = "活动描述\n")
 	private String description;
@@ -71,6 +74,12 @@ public class VipGroupActivity {
 	@ApiModelProperty(value = "会员时长")
 	private Integer memberTime;
 
+	@ApiModelProperty(value = "赠送会员编号")
+	private Integer giveMemberRankId;
+
+	@ApiModelProperty(value = "赠送会员时长")
+	private Integer giveMemberTime;
+
 	@ApiModelProperty(value = "活动变量1")
 	private String attribute1;
 
@@ -127,6 +136,30 @@ public class VipGroupActivity {
 	@ApiModelProperty(value = "课程可调整方向：0双向可调，1禁止线上到线下，2禁止线下到线上，3双向不可调")
 	private Integer allowOnlineToOffline = 0;
 
+	public Integer getGiveMemberRankId() {
+		return giveMemberRankId;
+	}
+
+	public void setGiveMemberRankId(Integer giveMemberRankId) {
+		this.giveMemberRankId = giveMemberRankId;
+	}
+
+	public Integer getGiveMemberTime() {
+		return giveMemberTime;
+	}
+
+	public void setGiveMemberTime(Integer giveMemberTime) {
+		this.giveMemberTime = giveMemberTime;
+	}
+
+	public Integer getGiveSingleCourseTime() {
+		return giveSingleCourseTime;
+	}
+
+	public void setGiveSingleCourseTime(Integer giveSingleCourseTime) {
+		this.giveSingleCourseTime = giveSingleCourseTime;
+	}
+
 	public String getCourseType() {
 		return courseType;
 	}

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

@@ -42,10 +42,13 @@
 		<result property="fullMinusCourseTimes" column="full_minus_course_times_"/>
 		<result property="giveCourseType" column="give_course_type_"/>
 		<result property="giveCourseNum" column="give_course_num_"/>
+		<result property="giveMemberRankId" column="give_member_rank_id_"/>
+		<result property="giveMemberTime" column="give_member_time_"/>
 		<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_"/>
+		<result property="giveSingleCourseTime" column="give_sign_course_time_"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -65,27 +68,63 @@
 		                                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_,course_type_,activity_type_)
+										,member_rank_id_,member_time_,give_member_rank_id_,give_member_time_,course_type_,activity_type_,give_sign_course_time_)
 		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},give_course_num_
-				  ,member_rank_id_,member_time_,course_type_,activity_type_)
+			   #{singleCourseTime},#{discount},#{fullMinusCourseTimes},#{giveCourseType},#{giveCategoryId},#{giveCourseNum}
+				  ,#{memberRankId},#{memberTime},#{giveMemberRankId},#{giveMemberTime},#{courseType},#{activityType},#{giveSingleCourseTime})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.VipGroupActivity">
 		UPDATE vip_group_activity
 		<set>
+			<if test="give_sign_course_time_ != null">
+				give_sign_course_time_ = #{giveSingleCourseTime},
+			</if>
+			<if test="single_course_time_ != null">
+				single_course_time_ = #{singleCourseTime},
+			</if>
+			<if test="discount_ != null">
+				discount_ = #{discount},
+			</if>
+			<if test="full_minus_course_times_ != null">
+				full_minus_course_times_ = #{fullMinusCourseTimes},
+			</if>
+			<if test="give_course_type_ != null">
+				give_course_type_ = #{giveCourseType},
+			</if>
+			<if test="give_category_id_ != null">
+				give_category_id_ = #{giveCategoryId},
+			</if>
+			<if test="give_course_num_ != null">
+				give_course_num_ = #{giveCourseNum},
+			</if>
+			<if test="activity_type_ != null">
+				activity_type_ = #{activityType},
+			</if>
+			<if test="course_type_ != null">
+				course_type_ = #{courseType},
+			</if>
+			<if test="member_time_ != null">
+				member_time_ = #{memberTime},
+			</if>
+			<if test="member_rank_id_ != null">
+				member_rank_id_ = #{memberRankId},
+			</if>
+			<if test="give_member_time_ != null">
+				give_member_time_ = #{giveMemberTime},
+			</if>
+			<if test="give_member_rank_id_ != null">
+				give_member_rank_id_ = #{giveMemberRankId},
+			</if>
 			<if test="salaryReadonlyFlag != null">
 				salary_readonly_flag_ = #{salaryReadonlyFlag},
 			</if>
 			<if test="organId != null">
 				organ_id_ = #{organId},
 			</if>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
 			<if test="giveClassPaySalaryFlag != null">
 				give_class_pay_salary_flag_ = #{giveClassPaySalaryFlag},
 			</if>
@@ -155,7 +194,7 @@
 			<if test="allowOnlineToOffline!=null">
 				allow_online_to_offline_=#{allowOnlineToOffline},
 			</if>
-			update_time_ = NOW(),
+			update_time_ = NOW()
 		</set>WHERE id_ = #{id}
 	</update>
 
@@ -166,15 +205,18 @@
 
 	<sql id="queryCondition">
 		<where>
-			vga.del_flag_=0
+			vga.del_flag_ = 0
+			<if test="courseType != null and courseType != ''">
+				AND course_type_ = #{courseType}
+			</if>
+			<if test="giveCourseType != null and giveCourseType != ''">
+				AND give_course_type_ = #{giveCourseType}
+			</if>
 			<if test="organId != null">
 				AND INTE_ARRAY(organ_id_,#{organId})
 			</if>
-			<if test="enable != null and enable == true">
-				AND ((NOW() &lt; end_time_ AND NOW() > start_time_) OR end_time_ IS NULL)
-			</if>
-			<if test="enable != null and enable == false">
-				AND (NOW() >= end_time_ OR NOW() &lt;= start_time_)
+			<if test="enable != null">
+				AND enable_ = #{enable}
 			</if>
 			<if test="search != null and search != ''">
 				AND (vga.id_=#{search} OR vga.name_ LIKE CONCAT('%', #{search}, '%'))
@@ -182,9 +224,6 @@
 			<if test="applyToStudentType!=null">
 				AND apply_to_student_type_=#{applyToStudentType}
 			</if>
-			<if test="allowOnlineToOffline!=null">
-				AND allow_online_to_offline_=#{allowOnlineToOffline}
-			</if>
 		</where>
 	</sql>