1.排队取号 同一用户订阅同一号码不提示
This commit is contained in:
@@ -144,7 +144,6 @@ public class TbCallServiceImpl implements TbCallService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object getState(String openId, Integer shopId, Integer queueId) {
|
public Object getState(String openId, Integer shopId, Integer queueId) {
|
||||||
// 先根据openId查询,查询不到根据queueId
|
|
||||||
List<CallQueueInfoVO> callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today(), queueId);
|
List<CallQueueInfoVO> callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today(), queueId);
|
||||||
if (callQueueInfoVOS.isEmpty()) {
|
if (callQueueInfoVOS.isEmpty()) {
|
||||||
callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today(), null);
|
callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today(), null);
|
||||||
@@ -165,6 +164,10 @@ public class TbCallServiceImpl implements TbCallService {
|
|||||||
throw new MsgException("您未排号请先排号");
|
throw new MsgException("您未排号请先排号");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (queue.getOpenId().equals(subMsgDTO.getOpenId()) && queue.getSubState() == 1) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
if (StrUtil.isNotBlank(queue.getOpenId()) && queue.getSubState() == 1) {
|
if (StrUtil.isNotBlank(queue.getOpenId()) && queue.getSubState() == 1) {
|
||||||
throw new MsgException("此号码已被其他用户订阅");
|
throw new MsgException("此号码已被其他用户订阅");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user