活动排课

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ActivityUserMapperDao.java

@@ -131,6 +131,8 @@ public interface ActivityUserMapperDao extends BaseDAO<Integer, ActivityUserMapp
                                             @Param("classMinutes") Integer classMinutes);
 
     void batchUpdate(@Param("useActivityUserMappers") List<ActivityUserMapper> useActivityUserMappers);
+    void batchUpdateFree(@Param("useActivityUserMappers") List<ActivityUserMapper> useActivityUserMappers);
+    void batchUpdate1(@Param("useActivityUserMappers") List<ActivityUserMapper> useActivityUserMappers);
 
     List<ActivityUserMapper> findByIds(@Param("activityUserMapperIds") String activityUserMapperIds);
 }

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

@@ -1106,7 +1106,6 @@ 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();
@@ -1118,7 +1117,6 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 			courseScheduleStudentPayment.setActivityUserMapperId(activityUserMapper.getId());
 			courseScheduleStudentPayment.setActualPrice(ZERO);
 			courseScheduleStudentPayment.setExpectPrice(ZERO);
-			activityUserMapperDao.update(activityUserMapper);
 		}else {
 			throw new BizException("所选学员排课资格不足");
 		}

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

@@ -3105,6 +3105,13 @@ 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, "学生复学扣除课程余额");
         }
+        //更新资格
+        if(!CollectionUtils.isEmpty(activityUserMappers)){
+            activityUserMapperService.getDao().batchUpdate(activityUserMappers);
+        }
+        if(!CollectionUtils.isEmpty(freeActivityUserMappers)){
+            activityUserMapperService.getDao().batchUpdateFree(freeActivityUserMappers);
+        }
         studentPauseInfo.setDelFlag(1);
         studentPauseInfoDao.update(studentPauseInfo);
         vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
@@ -3953,6 +3960,13 @@ 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课加学员扣除课程余额");
             }
+            //更新资格
+            if(!CollectionUtils.isEmpty(activityUserMappers)){
+                activityUserMapperService.getDao().batchUpdate(activityUserMappers);
+            }
+            if(!CollectionUtils.isEmpty(freeActivityUserMappers)){
+                activityUserMapperService.getDao().batchUpdateFree(freeActivityUserMappers);
+            }
 
             //创建班级学生关联记录
             ClassGroupStudentMapper classGroupStudentMapper;

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

@@ -241,6 +241,29 @@
 			</set>WHERE id_ = #{entity.id}
 		</foreach>
 	</update>
+	<update id="batchUpdateFree">
+		<foreach collection="useActivityUserMappers" item="entity" separator=";">
+			UPDATE activity_user_mapper
+			<set>
+				<if test="entity.subGiveCourseNum != null">
+					sub_give_course_num_ = #{entity.subGiveCourseNum},
+				</if>
+				<if test="entity.giveVipGroupId != null">
+					give_vip_group_id_ = #{entity.giveVipGroupId},
+				</if>
+				<if test="entity.givePracticeGroupId != null">
+					give_practice_group_id_ = #{entity.givePracticeGroupId},
+				</if>
+				<if test="entity.givePracticeFlag != null">
+					give_practice_flag_ = #{entity.givePracticeFlag},
+				</if>
+				<if test="entity.giveVipFlag != null">
+					give_vip_flag_ = #{entity.giveVipFlag},
+				</if>
+				update_time_ = NOW()
+			</set>WHERE id_ = #{entity.id}
+		</foreach>
+	</update>
 
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >