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

就餐人数获取修改

Browse Source
This commit is contained in:
SongZhang
2024-09-27 14:39:44 +08:00
parent 9d380d435f
commit 7bd9f8e97b
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
View File

@@ -142,7 +142,9 @@ public class ProductService {
TbOrderInfo order = getCurrentOrder(shopEatTypeInfoDTO, code, shopInfo.getId());
if (tbShopTable != null) {
tbShopTable.setOrderId(order == null ? null : order.getId());
tbShopTable.setChoseCount(order != null && (order.getSeatCount() != null));
TbCashierCart seatCartInfo = getSeatCartInfo(shopId, tbShopTable.getQrcode(), Integer.valueOf(userId), shopEatTypeInfoDTO);
tbShopTable.setChoseCount(seatCartInfo != null && (seatCartInfo.getNumber() != null));
}
concurrentMap.put("shopTableInfo", tbShopTable == null ? "" : tbShopTable);
@@ -894,16 +896,7 @@ public class ProductService {
Integer userId = TokenUtil.getUserId();
LambdaQueryWrapper<TbCashierCart> query = new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, choseCountDTO.getShopId())
.eq(TbCashierCart::getProductId, "-999")
.eq(TbCashierCart::getSkuId, "-999")
.eq(TbCashierCart::getStatus, "create")
.gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
.and(r -> r.eq(TbCashierCart::getUserId, userId).or().isNull(TbCashierCart::getUserId))
.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType())
.eq(TbCashierCart::getTableId, choseCountDTO.getTableId());
TbCashierCart tbCashierCart = mpCashierCartMapper.selectOne(query);
TbCashierCart tbCashierCart = getSeatCartInfo(choseCountDTO, userId, shopEatTypeInfoDTO);
if (tbCashierCart == null) {
tbCashierCart = new TbCashierCart();
@@ -939,6 +932,19 @@ public class ProductService {
return tbCashierCart;
}
private TbCashierCart getSeatCartInfo(Object shopId, String tableId, Integer userId, ShopEatTypeInfoDTO shopEatTypeInfoDTO) {
LambdaQueryWrapper<TbCashierCart> query = new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, shopId)
.eq(TbCashierCart::getProductId, "-999")
.eq(TbCashierCart::getSkuId, "-999")
.eq(TbCashierCart::getStatus, "create")
.gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
.and(r -> r.eq(TbCashierCart::getUserId, userId).or().isNull(TbCashierCart::getUserId))
.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType())
.eq(TbCashierCart::getTableId, tableId);
return mpCashierCartMapper.selectOne(query);
}
public Object choseEatModel(ChoseEatModelDTO choseTableDTO) {
ShopEatTypeInfoDTO shopEatTypeInfoDTO = shopUtils.checkEatModel(choseTableDTO.getTableId(), choseTableDTO.getShopId());
if (!shopEatTypeInfoDTO.isTakeout()) {