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

1.代客下单 挂单之后masterId未增加修复

This commit is contained in:
SongZhang 2024-08-23 14:51:47 +08:00
parent b4f113e811
commit 96791306f2
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -754,10 +754,15 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.eq(TbCashierCart::getShopId, createOrderDTO.getShopId()) .eq(TbCashierCart::getShopId, createOrderDTO.getShopId())
.eq(TbCashierCart::getTableId, createOrderDTO.getTableId()) .eq(TbCashierCart::getTableId, createOrderDTO.getTableId())
.in(TbCashierCart::getStatus, "create", "refund") .in(TbCashierCart::getStatus, "create", "refund")
.and(query -> { .and(query2 -> {
query.eq(TbCashierCart::getMasterId, createOrderDTO.getMasterId()) query2.or(query3 -> {
.or(). query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
isNull(TbCashierCart::getMasterId); .eq(TbCashierCart::getMasterId, createOrderDTO.getMasterId());
})
.or((query4 -> {
query4.isNull(TbCashierCart::getTradeDay)
.eq(TbCashierCart::getMasterId, "");
}));
}); });
// if (createOrderDTO.getVipUserId() != null) { // if (createOrderDTO.getVipUserId() != null) {
// queryWrapper.eq(TbCashierCart::getUserId, createOrderDTO.getVipUserId()); // queryWrapper.eq(TbCashierCart::getUserId, createOrderDTO.getVipUserId());
@ -925,9 +930,15 @@ public class TbShopTableServiceImpl implements TbShopTableService {
queryWrapper.eq(TbCashierCart::getTableId, pendingDTO.getTableId()) queryWrapper.eq(TbCashierCart::getTableId, pendingDTO.getTableId())
.eq(TbCashierCart::getStatus, "create") .eq(TbCashierCart::getStatus, "create")
.eq(TbCashierCart::getTableId, pendingDTO.getTableId()) .eq(TbCashierCart::getTableId, pendingDTO.getTableId())
.and(query -> { .and(query2 -> {
query.eq(TbCashierCart::getMasterId, pendingDTO.getMasterId()).or() query2.or(query3 -> {
.isNull(TbCashierCart::getMasterId); query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
.eq(TbCashierCart::getMasterId, pendingDTO.getMasterId());
})
.or((query4 -> {
query4.isNull(TbCashierCart::getTradeDay)
.eq(TbCashierCart::getMasterId, "");
}));
}); });
// if (pendingDTO.getVipUserId() != null) { // if (pendingDTO.getVipUserId() != null) {
// queryWrapper.eq(TbCashierCart::getUserId, pendingDTO.getVipUserId()); // queryWrapper.eq(TbCashierCart::getUserId, pendingDTO.getVipUserId());
@ -1006,7 +1017,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
List<TbProductSku> skuList = productSkuRepository.findAllById(skuIds); List<TbProductSku> skuList = productSkuRepository.findAllById(skuIds);
HashMap<String, TbProductSku> skuMap = new HashMap<>(); LinkedHashMap<String, TbProductSku> skuMap = new LinkedHashMap<>();
skuList.forEach(item -> { skuList.forEach(item -> {
skuMap.put(item.getId().toString(), item); skuMap.put(item.getId().toString(), item);
}); });