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:34:14 +08:00
parent 0600a1d90e
commit 8eab206fff
1 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,31 +285,7 @@ public class OrderService {
cashierCartMapper.updateByPrimaryKeySelective(cart); cashierCartMapper.updateByPrimaryKeySelective(cart);
} }
} else { } else {
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>() List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create");
.notIn(TbCashierCart::getStatus, "final", "refund", "closed", "pending")
.eq(TbCashierCart::getShopId, cart.getShopId());
TbCashierCart finalCart = cart;
queryWrapper.eq(TbCashierCart::getTableId, cart.getTableId())
.and(q -> {
q.or(
query -> {
query.eq(TbCashierCart::getMasterId, finalCart.getMasterId())
.or()
.isNull(TbCashierCart::getMasterId)
.or()
.eq(TbCashierCart::getMasterId, "");
}
)
.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 = cashierCartMapper.selectALlByMasterId(masterId, "create");
// TbCashierCart cashierCart = cashierCartMapper.selectByDetail(masterId, productId, shopId, skuId.toString(), DateUtils.getDay(), uuid, tableId); // TbCashierCart cashierCart = cashierCartMapper.selectByDetail(masterId, productId, shopId, skuId.toString(), DateUtils.getDay(), uuid, tableId);
String finalMasterId = masterId; String finalMasterId = masterId;
@@ -326,7 +302,11 @@ public class OrderService {
}) })
.or((query4 -> { .or((query4 -> {
query4.isNull(TbCashierCart::getTradeDay) query4.isNull(TbCashierCart::getTradeDay)
.eq(TbCashierCart::getMasterId, ""); .and(q -> {
q.eq(TbCashierCart::getMasterId, "")
.or()
.isNull(TbCashierCart::getMasterId);
});
})); }));
})); }));