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

1.增加台桌状态

Browse Source
This commit is contained in:
SongZhang
2024-08-21 09:21:07 +08:00
parent da9f1ab68f
commit 2b7ca62abf
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
View File

@@ -55,13 +55,12 @@ public class OrderController {
@RequestHeader("clientType") String clientType, @RequestHeader("clientType") String clientType,
@RequestParam(value = "masterId", required = false) String masterId, @RequestParam(value = "masterId", required = false) String masterId,
@RequestParam(required = false) String tableId, @RequestParam(required = false) String tableId,
@RequestParam(required = false) Integer vipUserId,
@RequestParam("shopId") String shopId @RequestParam("shopId") String shopId
){ ){
if (tableId == null && StrUtil.isBlank(masterId)) { if (tableId == null && StrUtil.isBlank(masterId)) {
return Result.fail("masterId和tableId不能同时为空"); return Result.fail("masterId和tableId不能同时为空");
} }
return orderService.queryCart(masterId,shopId, vipUserId, tableId); return orderService.queryCart(masterId,shopId, tableId);
} }

23
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@@ -354,7 +354,7 @@ public class OrderService {
} }
} }
public Result queryCart(String masterId, String shopId, Integer vipUserId, String tableId) { public Result queryCart(String masterId, String shopId, String tableId) {
if (StringUtils.isEmpty(shopId)) { if (StringUtils.isEmpty(shopId)) {
return Result.fail(CodeEnum.SHOPINFONOEXIST); return Result.fail(CodeEnum.SHOPINFONOEXIST);
} }
@@ -368,12 +368,13 @@ public class OrderService {
queryWrapper.eq(TbCashierCart::getMasterId, masterId); queryWrapper.eq(TbCashierCart::getMasterId, masterId);
queryWrapper.isNull(TbCashierCart::getTableId); queryWrapper.isNull(TbCashierCart::getTableId);
// 台桌点单 // 台桌点单
}else if (StrUtil.isNotBlank(tableId) && vipUserId == null) { }else if (StrUtil.isNotBlank(tableId)) {
queryWrapper.eq(TbCashierCart::getTableId, tableId) queryWrapper.eq(TbCashierCart::getTableId, tableId)
.eq(TbCashierCart::getMasterId, masterId); .and(query -> {
// 会员点单 query.eq(TbCashierCart::getMasterId, masterId)
}else { .or()
queryWrapper.eq(TbCashierCart::getUserId, vipUserId); .isNull(TbCashierCart::getMasterId);
});
} }
@@ -496,11 +497,11 @@ public class OrderService {
// 台桌点单 // 台桌点单
}else if (StrUtil.isNotBlank(orderVo.getTableId()) && orderVo.getVipUserId() == null) { }else if (StrUtil.isNotBlank(orderVo.getTableId()) && orderVo.getVipUserId() == null) {
queryWrapper.eq(TbCashierCart::getTableId, orderVo.getTableId()) queryWrapper.eq(TbCashierCart::getTableId, orderVo.getTableId())
.eq(TbCashierCart::getTradeDay, day) .and(query -> {
.eq(TbCashierCart::getMasterId, orderVo.getMasterId()); query.eq(TbCashierCart::getMasterId, orderVo.getMasterId())
// 会员点单 .or()
}else { .isNull(TbCashierCart::getMasterId);
queryWrapper.eq(TbCashierCart::getUserId, orderVo.getVipUserId()); });
} }
List<TbCashierCart> list = mpCashierCartMapper.selectList(queryWrapper); List<TbCashierCart> list = mpCashierCartMapper.selectList(queryWrapper);