活动排课

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

@@ -52,7 +52,7 @@ public interface ActivityUserMapperDao extends BaseDAO<Integer, ActivityUserMapp
      * @author zx
      * @date 2021/10/15 15:53
      */
-    int use(@Param("activityUserMapperIds") String activityUserMapperIds,
+    Integer use(@Param("activityUserMapperIds") String activityUserMapperIds,
             @Param("studentIds") String studentIds,
             @Param("type") String type,
             @Param("groupId") Long groupId);

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

@@ -4833,7 +4833,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         practiceGroupDao.insert(applyBaseInfo);
         //消耗排课资格
         List<Integer> activityUserMapperIds = activityUserMappers.stream().map(e -> e.getId()).collect(Collectors.toList());
-        int use = activityUserMapperService.use(StringUtils.join(activityUserMapperIds), studentId.toString(), giveFlag ? "GIVE_PRACTICE" : "PRACTICE", applyBaseInfo.getId());
+        int use = activityUserMapperService.use(StringUtils.join(activityUserMapperIds,","), studentId.toString(), giveFlag ? "GIVE_PRACTICE" : "PRACTICE", applyBaseInfo.getId());
         if(use != 1){
             throw new BizException("网管课创建失败，请联系管理员");
         }

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

@@ -1038,7 +1038,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		//消耗排课资格
 		List<Integer> activityUserMapperIds = activityUserMappers.stream().map(e -> e.getId()).collect(Collectors.toList());
-		int use = activityUserMapperService.use(StringUtils.join(activityUserMapperIds), studentIds, giveFlag?"GIVE_VIP":"VIP", applyBaseInfo.getId());
+		int use = activityUserMapperService.use(StringUtils.join(activityUserMapperIds,","), studentIds, giveFlag?"GIVE_VIP":"VIP", applyBaseInfo.getId());
 		if(use != studentIdList.size()){
 			throw new BizException("VIP课创建失败，请联系管理员");
 		}

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

@@ -104,22 +104,24 @@
 		</set>WHERE id_ = #{id}
 	</update>
 	<update id="use">
+		UPDATE activity_user_mapper SET
 		<if test="type == 'VIP'">
-			UPDATE activity_user_mapper SET vip_flag_ = 2,vip_group_id_ = #{groupId},update_time_ = NOW()
-			WHERE FIND_IN_SET(id_,#{activityUserMapperIds}) AND FIND_IN_SET(user_id_,#{studentIds}) AND return_fee_ = 0 AND vip_flag_ = 1;
+			vip_flag_ = 2,vip_group_id_ = #{groupId},update_time_ = NOW()
+			WHERE vip_flag_ = 1
 		</if>
 		<if test="type == 'GIVE_VIP'">
-			UPDATE activity_user_mapper SET give_vip_flag_ = 2,give_vip_group_id_ = #{groupId},update_time_ = NOW()
-			WHERE FIND_IN_SET(id_,#{activityUserMapperIds}) AND FIND_IN_SET(user_id_,#{studentIds}) AND return_fee_ = 0 AND give_vip_flag_ = 1;
+			give_vip_flag_ = 2,give_vip_group_id_ = #{groupId},update_time_ = NOW()
+			WHERE give_vip_flag_ = 1
 		</if>
 		<if test="type == 'PRACTICE'">
-			UPDATE activity_user_mapper SET practice_flag_ = 2,practice_group_id_ = #{groupId},update_time_ = NOW()
-			WHERE FIND_IN_SET(id_,#{activityUserMapperIds}) AND FIND_IN_SET(user_id_,#{studentIds}) AND return_fee_ = 0 AND practice_flag_ = 1;
+			practice_flag_ = 2,practice_group_id_ = #{groupId},update_time_ = NOW()
+			WHERE practice_flag_ = 1
 		</if>
 		<if test="type == 'GIVE_PRACTICE'">
-			UPDATE activity_user_mapper SET give_practice_flag_ = 2,give_practice_group_id_ = #{groupId},update_time_ = NOW()
-			WHERE FIND_IN_SET(id_,#{activityUserMapperIds}) AND FIND_IN_SET(user_id_,#{studentIds}) AND return_fee_ = 0 AND give_practice_flag_ = 1;
+			give_practice_flag_ = 2,give_practice_group_id_ = #{groupId},update_time_ = NOW()
+			WHERE give_practice_flag_ = 1
 		</if>
+		AND FIND_IN_SET(id_,#{activityUserMapperIds}) AND FIND_IN_SET(user_id_,#{studentIds}) AND return_fee_ = 0
 	</update>
 
 	<!-- 根据主键删除一条记录 -->