diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java index 3615389..5c6fef1 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java @@ -48,9 +48,9 @@ public class TbCallTableController { return Result.successWithData(tbCallService.getAllInfo(shopId)); } - @DeleteMapping("/cancel") + @PostMapping("/cancel") public Result cancel( - @Validated @RequestParam CancelCallQueueDTO cancelCallQueueDTO + @Validated @RequestBody CancelCallQueueDTO cancelCallQueueDTO ) { return Result.successWithData(tbCallService.cancel(cancelCallQueueDTO)); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CallQueueInfoVO.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CallQueueInfoVO.java index 417f470..9174ce6 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CallQueueInfoVO.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CallQueueInfoVO.java @@ -11,4 +11,7 @@ public class CallQueueInfoVO { private Integer waitTime; private Integer state; private String callNum; + private String shopState; + private String shopName; + private String logo; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/mapper/TbCallQueueMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/mapper/TbCallQueueMapper.java index 4acebd9..f9601d2 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/mapper/TbCallQueueMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/mapper/TbCallQueueMapper.java @@ -3,7 +3,6 @@ package com.chaozhanggui.system.cashierservice.mapper; import com.chaozhanggui.system.cashierservice.entity.TbCallQueue; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.chaozhanggui.system.cashierservice.entity.vo.CallQueueInfoVO; -import org.apache.ibatis.annotations.Select; import java.util.List; @@ -15,7 +14,7 @@ import java.util.List; */ public interface TbCallQueueMapper extends BaseMapper { - List selectInfoByOpenId(Integer shopId, String openId); + List selectInfoByOpenId(Integer shopId, String openId, String today); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java index 961eaad..60eb167 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java @@ -98,7 +98,7 @@ public class TbCallServiceImpl implements TbCallService { @Override public Object getList(Integer shopId, String openId) { - return callQueueMapper.selectInfoByOpenId(shopId, openId); + return callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today()); } @Override diff --git a/src/main/resources/mapper/TbCallQueueMapper.xml b/src/main/resources/mapper/TbCallQueueMapper.xml index 2734db4..bd8f54c 100644 --- a/src/main/resources/mapper/TbCallQueueMapper.xml +++ b/src/main/resources/mapper/TbCallQueueMapper.xml @@ -35,6 +35,7 @@