Merge remote-tracking branch 'origin/develop-new' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantGroupController.java

@@ -47,7 +47,7 @@ public class TenantGroupController {
         return R.from(wrapper);
     }
 
-    @ApiOperation(value = "详情", notes = "机构小组表-根据详情ID查询单条, 传入id")
+    @ApiOperation(value = "查询机构群成员", notes = "查询机构群成员")
     @GetMapping("/queryGroupMember/{tenantGroupId}")
     public R<List<TenantGroupWrapper.TenantGroupMember>> queryGroupMember(@PathVariable("tenantGroupId") Long tenantGroupId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -26,6 +26,7 @@ import com.yonge.cooleshow.biz.dal.mapper.TenantGroupMapper;
 import com.yonge.cooleshow.biz.dal.service.ImGroupService;
 import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumMapper;
 import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumRefMapper;
+import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.service.ImGroupMemberService;
 import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
@@ -754,10 +755,21 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                 throw new BizException("创建机构小组群失败");
             }
         }
+        if ("-1".equals(imGroupId)) {
+            // 群已经解散，改为-1标志
+            log.info("群已经解散，不再添加机构小组群:" + imGroupId);
+            return;
+        }
         try {
-            Set<Long> userIds = new HashSet<>();
-            userIds.add(studentId);
-            imGroupService.addGroupMember(imGroupId, userIds);
+            ImGroup imGroup = imGroupService.getById(imGroupId);
+            if (imGroup != null) {
+                Set<Long> userIds = new HashSet<>();
+                userIds.add(studentId);
+                imGroupService.addGroupMember(imGroupId, userIds);
+            } else {
+                tenantGroup.setImGroupId("-1");
+                tenantGroupMapper.updateById(tenantGroup);
+            }
         } catch (Exception e) {
             log.error("加入机构小组群失败", e);
             throw new BizException("加入机构小组群失败");

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -567,16 +567,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
                 log.error("导入IM账号到三方 teacherId={}", teacher.getUserId(), e);
             }
 
-            // 机构老师与学生互加好友关系
-//            if (Optional.ofNullable(teacher.getTenantId()).orElse(-1L) > 0) {
-//                // 自动与机构老师成为好友
-//                Set<Long> collect = studentService.lambdaQuery()
-//                        .eq(Student::getTenantId, teacher.getTenantId()).list().stream()
-//                        .map(Student::getUserId).collect(Collectors.toSet());
-//
-//                imUserFriendService.saveUserFriend(teacher.getUserId(), collect);
-//            }
-
             //插入老师账户表
             UserAccount oldAcc = userAccountService.getById(teacherSubmitReq.getUserId());
             if (null == oldAcc) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantGroupServiceImpl.java

@@ -45,6 +45,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -367,9 +368,10 @@ public class TenantGroupServiceImpl extends ServiceImpl<TenantGroupMapper, Tenan
                 continue;
             }
             String imGroupId = groupBy.get(detail.getTenantGroupId());
+            ImGroup imGroup = imGroupService.getById(Optional.ofNullable(imGroupId).orElse("-1"));
             if (toTeacher != null) {
                 // 更换群主
-                if (!StringUtils.isEmpty(imGroupId)) {
+                if (imGroup != null) {
                     // 新负责人加入群
                     try {
                         SysUser newTeacher = sysUserService.getByUserId(toTeacher);
@@ -400,11 +402,12 @@ public class TenantGroupServiceImpl extends ServiceImpl<TenantGroupMapper, Tenan
                 }
                 this.lambdaUpdate()
                         .set(TenantGroup::getAdminId, toTeacher)
+                        .set(imGroup == null, TenantGroup::getImGroupId, "-1")
                         .eq(TenantGroup::getId, detail.getTenantGroupId())
                         .update();
             } else if (Boolean.TRUE.equals(detail.getDismiss())) {
                 // 解散群
-                if (!StringUtils.isEmpty(imGroupId)) {
+                if (imGroup != null) {
                     try {
                         imGroupCoreService.groupDismiss(imGroupId);
                     } catch (Exception e) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantMemberServiceImpl.java

@@ -344,7 +344,7 @@ public class TenantMemberServiceImpl extends ServiceImpl<TenantMemberMapper, Ten
     @Override
     public TenantMember getByAppIdAndTenantId(String appId, Long tenantId, EPayerType payerType) {
         return this.lambdaQuery()
-                .eq(TenantMember::getAppId, appId)
+//                .eq(TenantMember::getAppId, appId)
                 .eq(TenantMember::getTenantId, tenantId)
                 .eq(TenantMember::getStatus, AuthStatusEnum.PASS)
                 .eq(TenantMember::getPayerType, payerType)

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysMusicCompareRecordMapper.xml

@@ -404,7 +404,9 @@
 		<include refid="global.limit"/>
 	</select>
 	<select id="countWeChatStudentTrainData" resultType="java.lang.Integer">
-		select COUNT(st.user_id_)
+		select COUNT(c.user_id_) from
+		(
+		select st.user_id_
 		from student st
 		left join
 		(select smcr.user_id_,
@@ -453,6 +455,7 @@
 				avgTrainTimes &lt;= #{maxAvgTrainTimes} AND
 			</if>
 		</trim>
+		)c
 	</select>
 	<select id="wechatCompareRecordSum"
 			resultType="com.yonge.cooleshow.biz.dal.queryInfo.SysMusicCompareRecordQueryInfo$WechatCompareRecordSumDto">

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantGroupController.java

@@ -48,7 +48,7 @@ public class TenantGroupController {
         return R.from(wrapper);
     }
 
-    @ApiOperation(value = "详情", notes = "机构小组表-根据详情ID查询单条, 传入id")
+    @ApiOperation(value = "查询机构群成员", notes = "查询机构群成员")
     @GetMapping("/queryGroupMember/{tenantGroupId}")
     public R<List<TenantGroupWrapper.TenantGroupMember>> queryGroupMember(@PathVariable("tenantGroupId") Long tenantGroupId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();