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-09-05 11:24:42 +08:00
parent 39fb09e99a
commit 6360d01041
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,17 +195,21 @@ public class OrderService {
TbCashierCart finalCart = cart; TbCashierCart finalCart = cart;
queryWrapper.eq(TbCashierCart::getTableId, cart.getTableId()) queryWrapper.eq(TbCashierCart::getTableId, cart.getTableId())
.and(query -> { .and(q -> {
query.eq(TbCashierCart::getMasterId, finalCart.getMasterId()) q.or(
.or() query -> {
.isNull(TbCashierCart::getMasterId) query.eq(TbCashierCart::getMasterId, finalCart.getMasterId())
.or() .or()
.eq(TbCashierCart::getMasterId, ""); .isNull(TbCashierCart::getMasterId)
}) .or()
.and(query -> { .eq(TbCashierCart::getMasterId, "");
query.eq(TbCashierCart::getOrderId, finalCart.getOrderId()) }
.or() )
.isNull(TbCashierCart::getOrderId); .or(query -> {
query.eq(TbCashierCart::getOrderId, finalCart.getOrderId())
.or()
.isNull(TbCashierCart::getOrderId);
});
}); });
List<TbCashierCart> list = mpCashierCartMapper.selectList(queryWrapper.eq(TbCashierCart::getStatus, "create")); List<TbCashierCart> list = mpCashierCartMapper.selectList(queryWrapper.eq(TbCashierCart::getStatus, "create"));