Merge branch 'mec_update_2021-11-02' of http://git.dayaedu.com/yonge/mec into music_score_zouxuan

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();
@@ -209,8 +210,16 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		activityUserMapperAdjustLog.setActivityId(activityUserMapper.getActivityId());
 		activityUserMapperAdjustLog.setOperatorId(operatorId);
 		activityUserMapperAdjustLog.setOperatorName(operatorName);
+		if(activityUserMapper.getVipFlag() == 1 || activityUserMapper.getPracticeFlag() == 1){
+			activityUserMapperAdjustLog.setCourseNum(-1);
+		}
+		if(activityUserMapper.getGiveVipFlag() == 1 || activityUserMapper.getGivePracticeFlag() == 1){
+			activityUserMapperAdjustLog.setGiveCourseNum(-1);
+		}
 		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/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -248,11 +248,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupApplyBaseInfo().getVipGroupActivityId());
 		if(!vipGroup.getAllowOverstepActivityStudentNum() && Objects.nonNull(vipGroupActivity)
 				&& Objects.nonNull(vipGroupActivity.getStudentMaxUsedTimes()) && vipGroupActivity.getStudentMaxUsedTimes()!=-1 &&
+
 				StringUtils.isNotBlank(vipGroupApplyBaseInfoDto.getStudentIdList())){
 			List<String> tempStudentIds = Arrays.asList(vipGroupApplyBaseInfoDto.getStudentIdList().split(","));
 			List<Integer> errStudentIds = new ArrayList<>();
 			for (String studentIdStr : tempStudentIds) {
-				int useNum = vipGroupDao.countStudentUserActivityNum(vipGroup.getVipGroupApplyBaseInfo().getVipGroupActivityId(), Integer.valueOf(studentIdStr));
+				int useNum = activityUserMapperService.countActivityBuyNum(vipGroupActivity.getId(),Integer.valueOf(studentIdStr));
 				if(useNum >= vipGroupActivity.getStudentMaxUsedTimes()){
 					errStudentIds.add(Integer.valueOf(studentIdStr));
 				}
@@ -2655,13 +2656,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		VipGroupActivity vipGroupActivity = null;
 		if(Objects.nonNull(vipGroup.getVipGroupActivityId())){
-			vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupActivityId().intValue());
+			vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupActivityId());
 		}
 
 		if(Objects.nonNull(vipGroupActivity) && Objects.nonNull(vipGroupActivity.getStudentMaxUsedTimes()) && vipGroupActivity.getStudentMaxUsedTimes() != -1){
-			int useNum = vipGroupDao.countStudentUseingActivityNum(vipGroup.getVipGroupActivityId(), Integer.valueOf(user.getId()));
+			int useNum = activityUserMapperService.countActivityBuyNum(vipGroupActivity.getId(),user.getId());
 			if(useNum >= vipGroupActivity.getStudentMaxUsedTimes()){
-				throw new BizException("您已超过该活动购买次数限制", vipGroupActivity.getStudentMaxUsedTimes());
+				throw new BizException("您已超过该活动购买限制{}次", vipGroupActivity.getStudentMaxUsedTimes());
 			}
 		}
 

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">
-			(#{logs.operatorId},#{logs.operatorName},#{logs.activityId},#{logs.courseNum},#{logs.giveCourseNum},#{logs.memo},#{logs.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>
 
@@ -86,7 +90,7 @@
 				AND activity_id_ = #{activityId}
 			</if>
 		</where>
-		ORDER BY id_
+		ORDER BY id_ DESC
 		<include refid="global.limit"/>
 	</select>
 	

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

@@ -174,7 +174,7 @@
 				AND activity_id_ = #{activityId}
 			</if>
 		</where>
-		ORDER BY id_
+		ORDER BY id_ DESC
 		<include refid="global.limit"/>
 	</select>
 	

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

@@ -160,7 +160,7 @@
 					AND ses.rank_ids_ IS NULL
 				</if>
 				<if test="rankType == 1">
-					AND ses.rank_ids_ IS NOT NULL
+					AND ses.rank_ids_ IS NOT NULL AND ses.rank_ids_ != ''
 				</if>
 			</if>
 			<if test="type == null or type == ''">