From 675569c19ea95c8a0f7d635deb9669270e0186f7 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sat, 14 Sep 2024 15:16:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=8F=B7=E5=A2=9E=E5=8A=A0=E5=8F=AB?=
 =?UTF-8?q?=E5=8F=B7=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/controller/TbCallTableController.java  | 11 +++++++++++
 .../cashier/mybatis/mapper/TbCallQueueMapper.java  |  7 +++++++
 .../cn/ysk/cashier/mybatis/vo/CallRecordVO.java    | 14 ++++++++++++++
 .../cn/ysk/cashier/service/app/TbCallService.java  |  2 ++
 .../service/impl/app/TbCallServiceImpl.java        |  7 +++++++
 5 files changed, 41 insertions(+)
 create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/mybatis/vo/CallRecordVO.java

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbCallTableController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbCallTableController.java
index c11145b9..268dff3f 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbCallTableController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbCallTableController.java
@@ -102,5 +102,16 @@ public class TbCallTableController {
         return ResponseEntity.ok(tbCallService.getQueue(shopId, callTableId, state, page, size));
     }
 
+    @AnonymousAccess
+    @GetMapping("callRecord")
+    public ResponseEntity<?> getCallRecord(
+            @RequestParam Integer shopId,
+            @RequestParam(required = false) Integer callTableId,
+            @RequestParam(defaultValue = "1") Integer page,
+            @RequestParam(defaultValue = "10") Integer size
+    ) {
+        return ResponseEntity.ok(tbCallService.getCallRecord(shopId, callTableId, page, size));
+    }
+
 
 }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCallQueueMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCallQueueMapper.java
index 2cbb80a3..f30242e5 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCallQueueMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCallQueueMapper.java
@@ -1,7 +1,10 @@
 package cn.ysk.cashier.mybatis.mapper;
 
 import cn.ysk.cashier.mybatis.entity.TbCallQueue;
+import cn.ysk.cashier.mybatis.vo.CallRecordVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Select;
 
 /**
 * @author Administrator
@@ -11,6 +14,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface TbCallQueueMapper extends BaseMapper<TbCallQueue> {
 
+    @Select("select * from tb_call_queue a " +
+            "left join tb_call_table b on a.call_table_id=b.id " +
+            "where a.shop_id=#{shopId} and a.call_table_id=#{callTableId}")
+    Page<CallRecordVO> selectCallRecord(Integer shopId, Integer callTableId, Page<Object> objectPage);
 }
 
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/vo/CallRecordVO.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/vo/CallRecordVO.java
new file mode 100644
index 00000000..f408dd60
--- /dev/null
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/vo/CallRecordVO.java
@@ -0,0 +1,14 @@
+package cn.ysk.cashier.mybatis.vo;
+
+import cn.ysk.cashier.mybatis.entity.TbCallQueue;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.sql.Date;
+import java.time.Instant;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CallRecordVO extends TbCallQueue {
+    private String note;
+}
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/app/TbCallService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/app/TbCallService.java
index 2ae4d905..b12eeed2 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/app/TbCallService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/app/TbCallService.java
@@ -20,4 +20,6 @@ public interface TbCallService {
     Object takeNumberCode(Integer shopId, Integer callTableId);
 
     Object getQueue(Integer shopId, Integer callTableId, Integer state, Integer page, Integer size);
+
+    Object getCallRecord(Integer shopId, Integer callTableId, Integer page, Integer size);
 }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java
index 5b9900b9..ec1470a3 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java
@@ -10,6 +10,7 @@ import cn.ysk.cashier.dto.calltable.*;
 import cn.ysk.cashier.exception.BadRequestException;
 import cn.ysk.cashier.mybatis.entity.TbCallQueue;
 import cn.ysk.cashier.mybatis.entity.TbCallTable;
+import cn.ysk.cashier.mybatis.mapper.TbCallQueueMapper;
 import cn.ysk.cashier.mybatis.mapper.TbShopUserMapper;
 import cn.ysk.cashier.mybatis.service.TbCallQueueService;
 import cn.ysk.cashier.mybatis.service.TbCallTableService;
@@ -39,6 +40,7 @@ public class TbCallServiceImpl implements TbCallService {
     private final TbShopUserMapper shopUserMapper;
     private final TbShopInfoRepository shopInfoRepository;
     private final StringRedisTemplate redisTemplate;
+    private final TbCallQueueMapper tbCallQueueMapper;
 
     @Override
     public Object add(CallTableDTO addCallTableDTO) {
@@ -346,4 +348,9 @@ public class TbCallServiceImpl implements TbCallService {
         // 返回结果列表
         return toMap;
     }
+
+    @Override
+    public Object getCallRecord(Integer shopId, Integer callTableId, Integer page, Integer size) {
+        return tbCallQueueMapper.selectCallRecord(shopId, callTableId, new Page<>(page, size));
+    }
 }