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

fix: 清空购物车修复

Browse Source
This commit is contained in:
张松
2024-11-29 11:32:23 +08:00
parent 625b1b2fb5
commit 4a8d85f82b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1335,6 +1335,7 @@ public class OrderService {
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>() LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, cartVo.getShopId()) .eq(TbCashierCart::getShopId, cartVo.getShopId())
.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()) .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType())
.gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
.eq(TbCashierCart::getStatus, "create"); .eq(TbCashierCart::getStatus, "create");
if (shopEatTypeInfoDTO.isDineInAfter()) { if (shopEatTypeInfoDTO.isDineInAfter()) {
@@ -1344,7 +1345,6 @@ public class OrderService {
// 普通点单 // 普通点单
if (StrUtil.isBlank(cartVo.getTableId())) { if (StrUtil.isBlank(cartVo.getTableId())) {
queryWrapper.eq(TbCashierCart::getMasterId, cartVo.getMasterId()) queryWrapper.eq(TbCashierCart::getMasterId, cartVo.getMasterId())
.eq(TbCashierCart::getTradeDay, day)
.and(query -> query.isNull(TbCashierCart::getTableId) .and(query -> query.isNull(TbCashierCart::getTableId)
.or() .or()
.eq(TbCashierCart::getTableId, "")); .eq(TbCashierCart::getTableId, ""));
@@ -1404,7 +1404,9 @@ public class OrderService {
// 打印退款票据 // 打印退款票据
int finalOrderId = orderId; int finalOrderId = orderId;
ThreadUtil.execute(() -> { ThreadUtil.execute(() -> {
printMechineConsumer.printReturnTicket(finalOrderId, null); if (finalOrderId != 0) {
printMechineConsumer.printReturnTicket(finalOrderId, null);
}
}); });