Browse Source

活动排课

zouxuan 2 năm trước cách đây
mục cha
commit
13a97ee1f0

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

@@ -1106,6 +1106,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 			courseScheduleStudentPayment.setActivityUserMapperId(activityUserMapper.getId());
 			courseScheduleStudentPayment.setActualPrice(consumerPrice);
 			courseScheduleStudentPayment.setExpectPrice(consumerPrice);
+			activityUserMapperDao.update(activityUserMapper);
 		}else if (!org.springframework.util.CollectionUtils.isEmpty(freeActivityUserMappers) && freeActivityUserMappers.size() > indexDto.getKey()) {
 			ActivityUserMapper activityUserMapper = freeActivityUserMappers.get(indexDto.getKey());
 			Integer subCourseNum = activityUserMapper.getSubGiveCourseNum();
@@ -1117,6 +1118,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 			courseScheduleStudentPayment.setActivityUserMapperId(activityUserMapper.getId());
 			courseScheduleStudentPayment.setActualPrice(ZERO);
 			courseScheduleStudentPayment.setExpectPrice(ZERO);
+			activityUserMapperDao.update(activityUserMapper);
 		}else {
 			throw new BizException("所选学员排课资格不足");
 		}

+ 0 - 10
mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -3105,11 +3105,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         if(cashAccount.getCourseBalance().compareTo(courseBalance) != 0){
             sysUserCashAccountService.appendCourseBalance(studentRecoverInfo.getUserId(), cashAccount.getCourseBalance().subtract(courseBalance).negate(), PlatformCashAccountDetailTypeEnum.PAY_FEE, "学生复学扣除课程余额");
         }
-        //更新资格
-        activityUserMappers.addAll(freeActivityUserMappers);
-        if(!CollectionUtils.isEmpty(activityUserMappers)){
-            activityUserMapperService.getDao().batchUpdate(activityUserMappers);
-        }
         studentPauseInfo.setDelFlag(1);
         studentPauseInfoDao.update(studentPauseInfo);
         vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
@@ -3958,11 +3953,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             if(cashAccount.getCourseBalance().compareTo(courseBalance) != 0){
                 sysUserCashAccountService.appendCourseBalance(studentId, cashAccount.getCourseBalance().subtract(courseBalance).negate(), PlatformCashAccountDetailTypeEnum.PAY_FEE, "vip课加学员扣除课程余额");
             }
-            //更新资格
-            activityUserMappers.addAll(freeActivityUserMappers);
-            if(!CollectionUtils.isEmpty(activityUserMappers)){
-                activityUserMapperService.getDao().batchUpdate(activityUserMappers);
-            }
 
             //创建班级学生关联记录
             ClassGroupStudentMapper classGroupStudentMapper;