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-14 17:37:35 +08:00
parent 17d8dd01ca
commit 319a8e13c5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
View File

@@ -87,7 +87,7 @@ public class PrintMechineConsumer {
log.info("打印机列表，{}", ArrayUtil.toString(list)); log.info("打印机列表，{}", ArrayUtil.toString(list));
log.info("待打印订单信息, {}", orderInfo); log.info("待打印订单信息, {}", orderInfo);
list.parallelStream().forEach(tbPrintMachineWithBLOBs->{ list.forEach(tbPrintMachineWithBLOBs->{
if (!"network".equals(tbPrintMachineWithBLOBs.getConnectionType())) { if (!"network".equals(tbPrintMachineWithBLOBs.getConnectionType())) {
log.error("非网络打印机:{},{}",tbPrintMachineWithBLOBs.getAddress(),tbPrintMachineWithBLOBs.getConnectionType()); log.error("非网络打印机:{},{}",tbPrintMachineWithBLOBs.getAddress(),tbPrintMachineWithBLOBs.getConnectionType());
return; return;

5
src/main/resources/mapper/TbCallQueueMapper.xml
View File

@@ -35,7 +35,7 @@
<select id="selectInfoByOpenId" <select id="selectInfoByOpenId"
resultType="com.chaozhanggui.system.cashierservice.entity.vo.CallQueueInfoVO"> resultType="com.chaozhanggui.system.cashierservice.entity.vo.CallQueueInfoVO">
SELECT SELECT
d.shop_name, d.logo, d.status as shop_state, d.shop_name, d.logo, d.status as shop_state,
a.call_num, a.call_num,
a.id, -- 用户的排队记录ID a.id, -- 用户的排队记录ID
a.state, a.state,
@@ -46,11 +46,12 @@
COUNT(c.id) * b.wait_time AS wait_time -- 预计等待时间 COUNT(c.id) * b.wait_time AS wait_time -- 预计等待时间
FROM FROM
tb_call_queue a tb_call_queue a
left join tb_shop_info d on a.shop_id=d.id
LEFT JOIN LEFT JOIN
tb_call_table b ON a.call_table_id = b.id tb_call_table b ON a.call_table_id = b.id
LEFT JOIN LEFT JOIN
tb_call_queue c ON c.call_table_id = a.call_table_id tb_call_queue c ON c.call_table_id = a.call_table_id
left join tb_shop_info d on a.shop_id=d.id
AND c.create_time &lt; a.create_time AND c.create_time &lt; a.create_time
AND c.state IN (0, 1) -- 前面的人 AND c.state IN (0, 1) -- 前面的人
WHERE WHERE