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

1.代客下单 取单sql fix

Browse Source
This commit is contained in:
SongZhang
2024-08-23 13:31:10 +08:00
parent 28874a59f1
commit 64e89d5ed6
1 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -284,6 +284,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
/** /**
* 台桌状态校验 * 台桌状态校验
*
* @param tableId 桌码 * @param tableId 桌码
* @return z * @return z
*/ */
@@ -326,12 +327,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay()) query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
.eq(TbCashierCart::getMasterId, addCartDTO.getMasterId()); .eq(TbCashierCart::getMasterId, addCartDTO.getMasterId());
}) })
.or() .or((query4 -> {
.and(query4 -> {
query4.isNull(TbCashierCart::getTradeDay) query4.isNull(TbCashierCart::getTradeDay)
.eq(TbCashierCart::getMasterId, ""); .eq(TbCashierCart::getMasterId, "");
}) }));
;
}); });
TbCashierCart tbCashierCart = cashierCartMapper.selectOne(query); TbCashierCart tbCashierCart = cashierCartMapper.selectOne(query);
// 首次加入 // 首次加入
@@ -441,16 +440,14 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.in(TbCashierCart::getStatus, "create") .in(TbCashierCart::getStatus, "create")
.eq(TbCashierCart::getShopId, shopId) .eq(TbCashierCart::getShopId, shopId)
.and(query2 -> { .and(query2 -> {
query2.and(query3 -> { query2.or(query3 -> {
query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay()) query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
.eq(TbCashierCart::getMasterId, masterId); .eq(TbCashierCart::getMasterId, masterId);
}) })
.or() .or((query4 -> {
.and(query4 -> {
query4.isNull(TbCashierCart::getTradeDay) query4.isNull(TbCashierCart::getTradeDay)
.eq(TbCashierCart::getMasterId, ""); .eq(TbCashierCart::getMasterId, "");
}) }));
;
}); });
// if (vipUserId != null) { // if (vipUserId != null) {
@@ -523,6 +520,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
/** /**
* 增加库存 * 增加库存
*
* @param productId 商品id * @param productId 商品id
* @param skuId sku * @param skuId sku
* @param addNum 增加的库存数量 * @param addNum 增加的库存数量
@@ -538,6 +536,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
/** /**
* 减少库存 * 减少库存
*
* @param productId 商品数据 * @param productId 商品数据
* @param skuId sku * @param skuId sku
* @param decrNum 减少的数量 * @param decrNum 减少的数量
@@ -589,6 +588,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
/** /**
* 更新库存 * 更新库存
*
* @param cashierCart 购物车 * @param cashierCart 购物车
* @return 是否是第一次添加的商品 * @return 是否是第一次添加的商品
*/ */
@@ -618,6 +618,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
/** /**
* 更新取餐号 * 更新取餐号
*
* @param shopId 店铺id * @param shopId 店铺id
* @return 当前取餐号 * @return 当前取餐号
*/ */
@@ -911,8 +912,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
} }
@Override @Override
public Object pending(PendingDTO pendingDTO) { public Object pending(PendingDTO pendingDTO) {
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>() LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()