fix 排队提示

netflix-dao/src/main/java/com/cyksj/model/entity/CorpKfAccountSessionConfig.java

@@ -48,4 +48,9 @@ public class CorpKfAccountSessionConfig extends BaseEntity{
 	 * 非值班提示
 	 */
 	private String noDutyTips;
+
+	/**
+	 * 排队后台展示人数
+	 */
+	private Integer queueUserNum;
 }

netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpServiceImpl.java

@@ -954,7 +954,7 @@ public class CorpServiceImpl implements CorpService {
 		//没有值班人员
 		if (CollUtil.isEmpty(corpKfServiceIds)) {
 			log.info("当前客服账号:{}无值班人员,将客户:{}移入等待池", openKfId, externalUserid);
-			String dynamicQueueTipsGroupsMsg = getDynamicQueueTipsGroups(openKfId, dutyFollowIds, corpKfAccountSessionConfig.getDynamicQueueTips(), corpKfAccountSessionConfig.getQueueTips());
+			String dynamicQueueTipsGroupsMsg = getDynamicQueueTipsGroups(openKfId, dutyFollowIds, corpKfAccountSessionConfig);
 			sendCorpKfTextTips(corpId, externalUserid, openKfId, dynamicQueueTipsGroupsMsg);
 			//接入等待池
 			moveWaitingQueue(corpId, openKfId, externalUserid);
@@ -1006,7 +1006,7 @@ public class CorpServiceImpl implements CorpService {
 		if (CollUtil.isEmpty(filterKfCs)) {
 			log.info("当前客服账号:{}值班接待上限:{},将客户:{}移入等待池", openKfId, maxNum, externalUserid);
 			//动态排队信息
-			String dynamicQueueTipsGroupsMsg = getDynamicQueueTipsGroups(openKfId, dutyFollowIds, corpKfAccountSessionConfig.getDynamicQueueTips(), corpKfAccountSessionConfig.getQueueTips());
+			String dynamicQueueTipsGroupsMsg = getDynamicQueueTipsGroups(openKfId, dutyFollowIds, corpKfAccountSessionConfig);
 			//发送进入等待池消息
 			sendCorpKfTextTips(corpId, externalUserid, openKfId, dynamicQueueTipsGroupsMsg);
 			//移入等待池
@@ -1024,7 +1024,7 @@ public class CorpServiceImpl implements CorpService {
 				.eq(CorpKfWaitingQueueUser::getOpenKfId, openKfId));
 		if (selectCount > 0) {
 			//动态排队信息
-			String dynamicQueueTipsGroupsMsg = getDynamicQueueTipsGroups(openKfId, dutyFollowIds, corpKfAccountSessionConfig.getDynamicQueueTips(), corpKfAccountSessionConfig.getQueueTips());
+			String dynamicQueueTipsGroupsMsg = getDynamicQueueTipsGroups(openKfId, dutyFollowIds, corpKfAccountSessionConfig);
 			//发送进入等待池消息
 			sendCorpKfTextTips(null, externalUserid, openKfId, dynamicQueueTipsGroupsMsg);
 			//移入等待池
@@ -1039,13 +1039,16 @@ public class CorpServiceImpl implements CorpService {
 	 * 获取动态排队提示组合信息
 	 * 前方等待人数：当前接待客户数最少的客服正在接待的人员数量+等待池中排在当前用户之前的等待人数。
 	 */
-	private String getDynamicQueueTipsGroups(String openKfId, Set<String> dutyFollowIds, String dynamicQueueTips, String queueTips) {
+	private String getDynamicQueueTipsGroups(String openKfId, Set<String> dutyFollowIds,CorpKfAccountSessionConfig corpKfAccountSessionConfig) {
+		String dynamicQueueTips = corpKfAccountSessionConfig.getDynamicQueueTips();
+		String queueTips = corpKfAccountSessionConfig.getQueueTips();
 		if (StrUtil.isEmpty(dynamicQueueTips)) {
 			return queueTips;
 		}
-		Integer serviceCorpUserNum = corpKfServicerSessionRecordMapper.selectServiceCorpUserNum(openKfId, dutyFollowIds);
+		//排队后台展示人数
+		Integer queueUserNum = corpKfAccountSessionConfig.getQueueUserNum();
 		Integer count = corpKfWaitingQueueUserMapper.selectCount(Wrappers.lambdaQuery(CorpKfWaitingQueueUser.class).eq(CorpKfWaitingQueueUser::getOpenKfId, openKfId));
-		return dynamicQueueTips.replaceAll("#", serviceCorpUserNum + count + "") + "\n" + queueTips;
+		return dynamicQueueTips.replaceAll("#", queueUserNum + count + "") + "\n" + queueTips;
 	}
 
 	private void moveWaitingQueue(String corpId, String openKfId, String externalUserId) throws Exception {