Merge branch 'fix-del-live' into 'master'

getChange method

See merge request rays/pcloud-book!184

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/GroupQrcodeBizImpl.java

@@ -27,8 +27,8 @@ import com.pcloud.book.group.dto.GroupQrcodeInfoDTO;
 import com.pcloud.book.group.dto.GroupQrcodeServerDTO;
 import com.pcloud.book.group.dto.PushAddUserMessageDTO;
 import com.pcloud.book.group.dto.QrcodeNameAndProIdDTO;
+import com.pcloud.book.group.dto.UpdateGroupNameDTO;
 import com.pcloud.book.group.dto.WeixinQrcodeDTO;
-import com.pcloud.book.group.dto.*;
 import com.pcloud.book.group.entity.GroupQrcode;
 import com.pcloud.book.group.enums.QrcodeStatusEnum;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
@@ -69,6 +69,7 @@ import org.springframework.util.CollectionUtils;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -247,6 +248,7 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
             }
         }
         String url = null;
+        List<ClassifyQrcodeVO> canUserQrcode = Lists.newArrayList();
         for (ClassifyQrcodeVO vo : collect) {
             if (vo.getUserNumber() >= classify.getChangeNumber()) {
                 //将二维码修改为已满群状态
@@ -258,9 +260,14 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
                 log.info("[前端调用切群接口] getChangeGroupQrCode 处理超出了但是没有更新状态的群 vo:{}", vo);
             }
             if (vo.getUserNumber() < classify.getChangeNumber()) {
-                url = vo.getQrcodeUrl();
+                canUserQrcode.add(vo);
             }
         }
+        // 获取群人数最少的可用群二维码返回出去
+        if (!CollectionUtils.isEmpty(canUserQrcode)) {
+            ClassifyQrcodeVO vo = canUserQrcode.stream().min(Comparator.comparingInt(ClassifyQrcodeVO::getUserNumber)).orElseGet(ClassifyQrcodeVO::new);
+            url = StringUtil.isBlank(vo.getQrcodeUrl()) ? null : vo.getQrcodeUrl();
+        }
         if (Objects.isNull(url)) {
             // 如果没有群则新增一个
             String qrcodeUrl = changeGroupQrCode(classifyId);