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-26 14:39:19 +08:00
parent 34173023bc
commit c75b981b57
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
View File

@@ -185,10 +185,15 @@ public class CartService {
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>() LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, shopId) .eq(TbCashierCart::getShopId, shopId)
.gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()) .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
.eq(TbCashierCart::getUserId, userId)
.isNull(TbCashierCart::getOrderId) .isNull(TbCashierCart::getOrderId)
.eq(TbCashierCart::getStatus, "create"); .eq(TbCashierCart::getStatus, "create");
if (StrUtil.isNotBlank(tableId)) {
queryWrapper.eq(TbCashierCart::getTableId, tableId);
}else {
queryWrapper.eq(TbCashierCart::getUserId, userId);
}
List<TbCashierCart> tbCashierCarts = mpCashierCartMapper.selectList(queryWrapper);; List<TbCashierCart> tbCashierCarts = mpCashierCartMapper.selectList(queryWrapper);;
if (!CollectionUtils.isEmpty(tbCashierCarts)) { if (!CollectionUtils.isEmpty(tbCashierCarts)) {
for (TbCashierCart cashierCart : tbCashierCarts) { for (TbCashierCart cashierCart : tbCashierCarts) {
@@ -628,13 +633,8 @@ public class CartService {
queryWrapper.eq(TbCashierCart::getUserId, userId); queryWrapper.eq(TbCashierCart::getUserId, userId);
// 台桌点单 // 台桌点单
} else { } else {
queryWrapper queryWrapper.eq(TbCashierCart::getTableId, tableId)
.and(q -> { .and(q -> q.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()).or().isNull(TbCashierCart::getUseType));
q.eq(TbCashierCart::getUserId, userId).or().isNull(TbCashierCart::getUserId);
})
.and(q -> {
q.eq(TbCashierCart::getTableId, tableId).or().isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, "");
});
shopTable = mpShopTableMapper.selectOne(new LambdaQueryWrapper<TbShopTable>() shopTable = mpShopTableMapper.selectOne(new LambdaQueryWrapper<TbShopTable>()
.eq(TbShopTable::getQrcode, tableId)); .eq(TbShopTable::getQrcode, tableId));

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

@@ -485,7 +485,7 @@ public class OrderService {
groupedByPlaceNum.forEach((k, v) -> { groupedByPlaceNum.forEach((k, v) -> {
HashMap<String, Object> item = new HashMap<>(); HashMap<String, Object> item = new HashMap<>();
item.put("placeNum", k); item.put("placeNum", k);
item.put("placeTime", v.isEmpty() ? null : DateUtil.format(v.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss")); item.put("placeTime", v.isEmpty() ? null : DateUtil.format(v.get(0).getCreateTime(), "HH:mm:ss"));
item.put("info", v); item.put("info", v);
BigDecimal totalPrice = BigDecimal.ZERO; BigDecimal totalPrice = BigDecimal.ZERO;
for (TbOrderDetail d : v) { for (TbOrderDetail d : v) {