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

叫号返回叫号状态

Browse Source
This commit is contained in:
SongZhang
2024-09-24 15:03:05 +08:00
parent 69ec3f381c
commit 1e09c75ea0
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
eladmin-system/src/main/java/cn/ysk/cashier/controller/TbCallTableController.java
View File

@@ -5,6 +5,8 @@ import cn.ysk.cashier.dto.calltable.*;
import cn.ysk.cashier.exception.BadRequestException; import cn.ysk.cashier.exception.BadRequestException;
import cn.ysk.cashier.service.app.TbCallService; import cn.ysk.cashier.service.app.TbCallService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -20,6 +22,7 @@ import java.util.HashMap;
@AllArgsConstructor @AllArgsConstructor
public class TbCallTableController { public class TbCallTableController {
private static final Logger log = LoggerFactory.getLogger(TbCallTableController.class);
private final TbCallService tbCallService; private final TbCallService tbCallService;
@AnonymousAccess @AnonymousAccess
@@ -83,9 +86,11 @@ public class TbCallTableController {
try { try {
return ResponseEntity.ok(tbCallService.call(callQueueDTO)); return ResponseEntity.ok(tbCallService.call(callQueueDTO));
}catch (BadRequestException e) { }catch (BadRequestException e) {
HashMap<String, Object> data = new HashMap<>(); log.error("异常", e);
data.put("message", e.getMessage()); return ResponseEntity.ok(new HashMap<String, Object>(){{
return ResponseEntity.badRequest().body(data); put("state", "0");
put("message", e.getMessage());
}});
} }
} }

12
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java
View File

@@ -227,7 +227,9 @@ public class TbCallServiceImpl implements TbCallService {
} }
if (callQueue.getSubState().equals(0)) { if (callQueue.getSubState().equals(0)) {
throw new BadRequestException("当前用户未订阅微信提醒"); return new HashMap<String, Object>(){{
put("state", "-1");
}};
} }
callQueue.setState((byte) 1); callQueue.setState((byte) 1);
@@ -254,7 +256,9 @@ public class TbCallServiceImpl implements TbCallService {
if (StrUtil.isBlank(callQueue.getOpenId())) { if (StrUtil.isBlank(callQueue.getOpenId())) {
throw new BadRequestException("此用户未订阅微信小程序消息"); return new HashMap<String, Object>(){{
put("state", "-1");
}};
} }
wxMiniUtils.sendCurrentOrNearCallMsg(shopInfo.getShopName(), getStrByState(Integer.valueOf(callQueue.getState())), wxMiniUtils.sendCurrentOrNearCallMsg(shopInfo.getShopName(), getStrByState(Integer.valueOf(callQueue.getState())),
@@ -273,7 +277,9 @@ public class TbCallServiceImpl implements TbCallService {
wxMiniUtils.sendCurrentOrNearCallMsg(shopInfo.getShopName(), getStrByState(Integer.valueOf(nearQueue.getState())), wxMiniUtils.sendCurrentOrNearCallMsg(shopInfo.getShopName(), getStrByState(Integer.valueOf(nearQueue.getState())),
nearQueue.getCallNum(), current.isEmpty() ? "" : current.get(0).getCallNum(), "排号信息", nearQueue.getOpenId(), true); nearQueue.getCallNum(), current.isEmpty() ? "" : current.get(0).getCallNum(), "排号信息", nearQueue.getOpenId(), true);
} }
return flag; return new HashMap<String, Object>(){{
put("state", "1");
}};
} }
private String getStrByState(Integer state) { private String getStrByState(Integer state) {