zouxuan 3 years ago
parent
commit
1bd9b5c20d

+ 12 - 12
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);
 	}
 }