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

1.代客下单 无法下单fix

Browse Source
This commit is contained in:
SongZhang
2024-08-23 13:47:07 +08:00
parent 86ae5f962b
commit baf91df968
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java
View File

@@ -77,7 +77,7 @@ public class ProductController {
@RequestParam("categoryId") String categoryId, @RequestParam("categoryId") String categoryId,
@RequestParam("commdityName") String commdityName, @RequestParam("commdityName") String commdityName,
@RequestParam("masterId") String masterId, @RequestParam("masterId") String masterId,
@RequestParam("tableId") String tableId, @RequestParam(value = "tableId", required = false) String tableId,
@RequestParam("page") int page, @RequestParam("page") int page,
@RequestParam("pageSize") int pageSize @RequestParam("pageSize") int pageSize
){ ){

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

@@ -362,8 +362,11 @@ public class OrderService {
// 普通点单 // 普通点单
if (StrUtil.isBlank(tableId)) { if (StrUtil.isBlank(tableId)) {
queryWrapper.eq(TbCashierCart::getMasterId, masterId); queryWrapper.eq(TbCashierCart::getMasterId, masterId)
queryWrapper.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""); .eq(TbCashierCart::getTradeDay, day)
.and(query -> {
query.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, "");
});
// 台桌点单 // 台桌点单
}else if (StrUtil.isNotBlank(tableId)) { }else if (StrUtil.isNotBlank(tableId)) {
String finalMasterId = masterId; String finalMasterId = masterId;
@@ -495,15 +498,24 @@ public class OrderService {
// 普通点单 // 普通点单
if (StrUtil.isBlank(orderVo.getTableId())) { if (StrUtil.isBlank(orderVo.getTableId())) {
queryWrapper.eq(TbCashierCart::getMasterId, orderVo.getMasterId()) queryWrapper.eq(TbCashierCart::getMasterId, orderVo.getMasterId())
.eq(TbCashierCart::getTradeDay, day); .eq(TbCashierCart::getTradeDay, day)
queryWrapper.isNull(TbCashierCart::getTableId);
// 台桌点单
}else if (StrUtil.isNotBlank(orderVo.getTableId()) && orderVo.getVipUserId() == null) {
queryWrapper.eq(TbCashierCart::getTableId, orderVo.getTableId())
.and(query -> { .and(query -> {
query.eq(TbCashierCart::getMasterId, orderVo.getMasterId()) query.isNull(TbCashierCart::getTableId)
.or() .or()
.isNull(TbCashierCart::getMasterId); .eq(TbCashierCart::getTableId, "");
});
// 台桌点单
}else if (StrUtil.isNotBlank(orderVo.getTableId())) {
queryWrapper.eq(TbCashierCart::getTableId, orderVo.getTableId())
.and(query2 -> {
query2.or(query3 -> {
query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
.eq(TbCashierCart::getMasterId, orderVo.getMasterId());
})
.or((query4 -> {
query4.isNull(TbCashierCart::getTradeDay)
.eq(TbCashierCart::getMasterId, "");
}));
}); });
} }