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

1.代客下单 挂起订单

Browse Source
This commit is contained in:
SongZhang
2024-08-17 15:21:45 +08:00
parent e938911e4a
commit 89582d3bc8
5 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -822,14 +822,23 @@ public class TbShopTableServiceImpl implements TbShopTableService {
@Override
public Object pending(PendingDTO pendingDTO) {
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, pendingDTO.getShopId())
.eq(TbCashierCart::getTableId, pendingDTO.getTableId())
.eq(TbCashierCart::getStatus, "create");
if (pendingDTO.getVipUserId() != null) {
queryWrapper.eq(TbCashierCart::getUserId, pendingDTO.getVipUserId());
.eq(TbCashierCart::getShopId, pendingDTO.getShopId());
if (!pendingDTO.getIsPending()) {
if (pendingDTO.getOrderId() == null) {
throw new BadRequestException("取消挂起订单id不为空");
}
queryWrapper.eq(TbCashierCart::getOrderId, pendingDTO.getOrderId());
}else {
queryWrapper.eq(TbCashierCart::getMasterId, pendingDTO.getMasterId())
.isNull(TbCashierCart::getUserId);
queryWrapper.eq(TbCashierCart::getTableId, pendingDTO.getTableId())
.eq(TbCashierCart::getStatus, "create");
if (pendingDTO.getVipUserId() != null) {
queryWrapper.eq(TbCashierCart::getUserId, pendingDTO.getVipUserId());
}else {
queryWrapper.eq(TbCashierCart::getMasterId, pendingDTO.getMasterId())
.isNull(TbCashierCart::getUserId);
}
}
List<TbCashierCart> cashierCarts = cashierCartMapper
.selectList(queryWrapper);
@@ -875,13 +884,15 @@ public class TbShopTableServiceImpl implements TbShopTableService {
@Override
public Object getCar(Integer shopId) {
ArrayList<HashMap<String, Object>> data = new ArrayList<>();
ArrayList<Map<String, Object>> data = new ArrayList<>();
List<PendingCountVO> pendingCountVOS = cashierCartMapper.countPending(shopId);
List<TbCashierCart> tbCashierCarts = cashierCartMapper.selectList(new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, shopId)
.eq(TbCashierCart::getStatus, "refund"));
cashierCartMapper.selectPending(shopId);
HashMap<String, List<TbCashierCart>> cashierMap = new HashMap<>();
for (TbCashierCart tbCashierCart : tbCashierCarts) {
List<TbCashierCart> list = cashierMap.computeIfAbsent(tbCashierCart.getOrderId().toString(), k -> new ArrayList<>());
@@ -891,6 +902,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
pendingCountVOS.forEach(item -> {
Map<String, Object> map = BeanUtil.beanToMap(item, false, false);
map.put("carList", cashierMap.get(item.getOrderId().toString()));
data.add(map);
});
return data;
}