czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.排队取号 限制同一微信订阅次数

Browse Source
This commit is contained in:
SongZhang
2024-09-23 16:54:37 +08:00
parent 43ef3695e1
commit 7b996aff93
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java
View File

@@ -37,13 +37,10 @@ public class TbCallTableController {
*/ */
@GetMapping("queue") @GetMapping("queue")
public Result get( public Result get(
@RequestParam(required = false) String openId, @RequestParam String openId,
@RequestParam Integer shopId, @RequestParam Integer shopId,
@RequestParam(required = false) Integer queueId @RequestParam(required = false) Integer queueId
) { ) {
if (StrUtil.isBlank(openId) && queueId == null) {
return Result.fail("shopId和queueId不能同时为空");
}
return Result.successWithData(tbCallService.getList(shopId, openId, queueId)); return Result.successWithData(tbCallService.getList(shopId, openId, queueId));
} }
@@ -73,7 +70,7 @@ public class TbCallTableController {
return Result.successWithData(tbCallService.getState(openId, shopId, queueId)); return Result.successWithData(tbCallService.getState(openId, shopId, queueId));
} }
@PutMapping("subMsg") @PostMapping("subMsg")
public Result subMsg( public Result subMsg(
@Validated @RequestBody CallSubMsgDTO subMsgDTO @Validated @RequestBody CallSubMsgDTO subMsgDTO
) { ) {

20
src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java
View File

@@ -85,7 +85,7 @@ public class TbCallServiceImpl implements TbCallService {
} }
TbCallQueue callQueue = callQueueService.lambdaQuery() TbCallQueue callQueue = callQueueService.lambdaQuery()
.eq(TbCallQueue::getPhone, takeNumberDTO.getPhone()) // .eq(TbCallQueue::getPhone, takeNumberDTO.getPhone())
.eq(TbCallQueue::getOpenId, takeNumberDTO.getOpenId()) .eq(TbCallQueue::getOpenId, takeNumberDTO.getOpenId())
.eq(TbCallQueue::getShopId, takeNumberDTO.getShopId()) .eq(TbCallQueue::getShopId, takeNumberDTO.getShopId())
.eq(TbCallQueue::getCreateDay, DateUtil.today()) .eq(TbCallQueue::getCreateDay, DateUtil.today())
@@ -97,7 +97,7 @@ public class TbCallServiceImpl implements TbCallService {
} }
callQueue = BeanUtil.copyProperties(takeNumberDTO, TbCallQueue.class); callQueue = BeanUtil.copyProperties(takeNumberDTO, TbCallQueue.class);
callQueue.setSubState(1); callQueue.setSubState(0);
callQueue.setCreateTime(DateUtil.date()); callQueue.setCreateTime(DateUtil.date());
callQueue.setShopId(shopInfo.getId()); callQueue.setShopId(shopInfo.getId());
callQueue.setShopName(shopInfo.getShopName()); callQueue.setShopName(shopInfo.getShopName());
@@ -165,6 +165,22 @@ public class TbCallServiceImpl implements TbCallService {
throw new MsgException("您未排号请先排号"); throw new MsgException("您未排号请先排号");
} }
if (StrUtil.isNotBlank(queue.getOpenId()) && queue.getSubState() == 1) {
throw new MsgException("此号码已被其他用户订阅");
}
Integer count = callQueueService.lambdaQuery()
// .eq(TbCallQueue::getPhone, takeNumberDTO.getPhone())
.eq(TbCallQueue::getOpenId, subMsgDTO.getOpenId())
.eq(TbCallQueue::getShopId, subMsgDTO.getShopId())
.eq(TbCallQueue::getCreateDay, DateUtil.today())
.in(TbCallQueue::getState, 0, 1)
.ne(TbCallQueue::getIsPostpone, 2)
.eq(TbCallQueue::getCallTableId, queue.getCallTableId()).count();
if (count > 0) {
throw new MsgException("您已订阅其他号码，请勿重复订阅");
}
queue.setSubState(1); queue.setSubState(1);
queue.setOpenId(subMsgDTO.getOpenId()); queue.setOpenId(subMsgDTO.getOpenId());
return callQueueMapper.updateById(queue); return callQueueMapper.updateById(queue);