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

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

@@ -200,6 +200,18 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		activityUserMapper.setCutMemo(memo);
 		activityUserMapper.setReturnFee(true);
 		activityUserMapperDao.update(activityUserMapper);
+
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		Integer operatorId = sysUser.getId();
+		String operatorName = sysUser.getRealName();
+		//添加操作记录
+		ActivityUserMapperAdjustLog activityUserMapperAdjustLog = new ActivityUserMapperAdjustLog();
+		activityUserMapperAdjustLog.setActivityId(activityUserMapper.getActivityId());
+		activityUserMapperAdjustLog.setOperatorId(operatorId);
+		activityUserMapperAdjustLog.setOperatorName(operatorName);
+		activityUserMapperAdjustLog.setMemo(memo);
+		activityUserMapperAdjustLog.setUserId(activityUserMapper.getUserId());
+		activityUserMapperAdjustLogDao.insert(activityUserMapperAdjustLog);
 		if(amount == null || amount.compareTo(BigDecimal.ZERO) <= 0){
 			return;
 		}
@@ -216,17 +228,5 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		sysUserCashAccountLog.setReturnFeeType(ReturnFeeEnum.CANCEL_ACTIVITY_COURSE);
 		sysUserCashAccountLog.setComment("取消活动排课");
 		sysUserCashAccountLogDao.insert(sysUserCashAccountLog);
-
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		Integer operatorId = sysUser.getId();
-		String operatorName = sysUser.getRealName();
-		//添加操作记录
-		ActivityUserMapperAdjustLog activityUserMapperAdjustLog = new ActivityUserMapperAdjustLog();
-		activityUserMapperAdjustLog.setActivityId(activityUserMapper.getActivityId());
-		activityUserMapperAdjustLog.setOperatorId(operatorId);
-		activityUserMapperAdjustLog.setOperatorName(operatorName);
-		activityUserMapperAdjustLog.setMemo(memo);
-		activityUserMapperAdjustLog.setUserId(activityUserMapper.getUserId());
-		activityUserMapperAdjustLogDao.insert(activityUserMapperAdjustLog);
 	}
 }

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

@@ -38,7 +38,7 @@
 		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
 		<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())
 		</foreach>
 	</insert>
 

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 == ''">