zouxuan 2 anni fa
parent
commit
457f5b7c83

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

@@ -4514,7 +4514,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 //关闭课程组
                 vipGroupDao.batchUpdate(noStudentGroup);
             }
-            Date now = new Date();
             if(!CollectionUtils.isEmpty(hasStudentGroup)){
                 //排课
                 for (VipGroup vipGroup : hasStudentGroup) {
@@ -4522,7 +4521,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                     vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
                     Integer tenantId = vipGroup.getTenantId();
                     for (String s : vipGroup.getStudentIdList().split(",")) {
-                        Integer userId = Integer.parseInt(s);
                         classGroup.setDelFlag(0);
                         VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(vipGroup.getVipGroupCategoryId(),
                                 vipGroup.getOrganId(), vipGroup.getGroupType());
@@ -4607,15 +4605,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                         imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), classGroup.getName(),
                                 vipGroup.getName(), null, null, vipGroup.getGroupType(), ImGroup.GroupTypeEnum.valueOf(vipGroup.getGroupType()));
                         imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
-                        imUserFriendService.refreshGroupImUserFriend(classGroup.getMusicGroupId(), classGroup.getGroupType());
-                        //更新所属分部列表
-                        List<Integer> organIds = classGroupDao.findStudentOrganIdsByClassGroup(classGroup.getId().longValue());
-                        organIds.add(vipGroup.getOrganId());
-                        HashSet<Integer> hashSet = new HashSet<>(organIds);
-                        String organIdsString = StringUtils.join(hashSet, ",");
-                        vipGroup.setOrganIdList(organIdsString);
-                        vipGroupDao.update(vipGroup);
                     }
+                    imUserFriendService.refreshGroupImUserFriend(classGroup.getMusicGroupId(), classGroup.getGroupType());
+                    vipGroupDao.update(vipGroup);
                 }
             }
         }