update

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

@@ -7,6 +7,9 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
  */
 public class ActivityUserMapperAdjustLog {
 
+	/**  1加资格0减资格*/
+	private Integer type;
+
 	/**  */
 	private Integer id;
 	
@@ -36,7 +39,25 @@ public class ActivityUserMapperAdjustLog {
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	private Integer activityUserMapperId;
+
+	public Integer getActivityUserMapperId() {
+		return activityUserMapperId;
+	}
+
+	public void setActivityUserMapperId(Integer activityUserMapperId) {
+		this.activityUserMapperId = activityUserMapperId;
+	}
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

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

@@ -141,6 +141,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 			activityUserMapperAdjustLog.setGiveCourseNum(adjustDto.getGiveCourseNum());
 			activityUserMapperAdjustLog.setMemo(memo);
 			activityUserMapperAdjustLog.setUserId(adjustDto.getUserId());
+			activityUserMapperAdjustLog.setType(1);
 			activityUserMapperAdjustLogs.add(activityUserMapperAdjustLog);
 
 			int activityUserMapperNum = adjustDto.getCourseNum();
@@ -211,6 +212,8 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		activityUserMapperAdjustLog.setOperatorName(operatorName);
 		activityUserMapperAdjustLog.setMemo(memo);
 		activityUserMapperAdjustLog.setUserId(activityUserMapper.getUserId());
+		activityUserMapperAdjustLog.setType(0);
+		activityUserMapperAdjustLog.setActivityUserMapperId(activityUserMapperId);
 		activityUserMapperAdjustLogDao.insert(activityUserMapperAdjustLog);
 		if(amount == null || amount.compareTo(BigDecimal.ZERO) <= 0){
 			return;

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

@@ -15,6 +15,8 @@
 		<result column="give_course_num_" property="giveCourseNum" />
 		<result column="memo_" property="memo" />
 		<result column="user_id_" property="userId" />
+		<result column="type_" property="type" />
+		<result column="activity_user_mapper_id_" property="activityUserMapperId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -31,14 +33,16 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ActivityUserMapperAdjustLog" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO activity_user_mapper_adjust_log (operator_id_,operator_name_,activity_id_,course_num_,give_course_num_,memo_,user_id_,create_time_,update_time_)
-		VALUES(#{operatorId},#{operatorName},#{activityId},#{courseNum},#{giveCourseNum},#{memo},#{userId},NOW(),NOW())
+		INSERT INTO activity_user_mapper_adjust_log (operator_id_,operator_name_,activity_id_,
+		                                             course_num_,give_course_num_,memo_,user_id_,create_time_,update_time_,type_,activity_user_mapper_id_)
+		VALUES(#{operatorId},#{operatorName},#{activityId},#{courseNum},#{giveCourseNum},#{memo},#{userId},NOW(),NOW(),#{type},#{activityUserMapperId})
 	</insert>
 	<insert id="batchInsert">
-		INSERT INTO activity_user_mapper_adjust_log (operator_id_,operator_name_,activity_id_,course_num_,give_course_num_,memo_,user_id_,create_time_,update_time_)
+		INSERT INTO activity_user_mapper_adjust_log (operator_id_,operator_name_,activity_id_,course_num_,
+		                                             give_course_num_,memo_,user_id_,create_time_,update_time_,type_,activity_user_mapper_id_)
 		VALUES
 		<foreach collection="logs" separator="," item="bean">
-			(#{bean.operatorId},#{bean.operatorName},#{bean.activityId},#{bean.courseNum},#{bean.giveCourseNum},#{bean.memo},#{bean.userId},NOW(),NOW())
+			(#{bean.operatorId},#{bean.operatorName},#{bean.activityId},#{bean.courseNum},#{bean.giveCourseNum},#{bean.memo},#{bean.userId},NOW(),NOW(),#{bean.type},#{bean.activityUserMapperId})
 		</foreach>
 	</insert>