czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: czg_team:5eda003316ea583f5ede465c428d405edee9a2d8
Branches Tags
czg_team:master czg_team:prod czg_team:test czg_team:dev czg_team:pay czg_team:backup-250910
...
compare: czg_team:15920ce384bb2c6970a0e80e5c8d3780b06b8cd0
Branches Tags
czg_team:prod czg_team:test czg_team:dev czg_team:pay czg_team:backup-250910 czg_team:master

2 Commits
5eda003316 ... 15920ce384

Author SHA1 Message Date
wangw
15920ce384 删除单子 清台 2026-03-30 18:14:55 +08:00
wangw
875c61adb6 删除单子 清台 2026-03-30 18:10:58 +08:00
1 changed files with 24 additions and 0 deletions
Expand all files Collapse all files

24
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
View File

@@ -1669,6 +1669,18 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
if (orderInfo.getPlaceNum().equals(1)) {
orderInfoService.updateById(new OrderInfo().setId(orderId)
.setStatus(OrderStatusEnums.CANCELLED.getCode()));
ShopTable table = shopTableService.getOneByTableCode(orderInfo.getShopId(), orderInfo.getTableCode());
if (table != null) {
ShopInfo shopInfo = shopInfoService.getById(orderInfo.getShopId());
if ("auto".equals(shopInfo.getTableClearType())) {
table.setStatus(ShopTableStatusEnum.IDLE.getValue());
} else {
DateTime dateTime = DateUtil.offsetMinute(DateUtil.date(), shopInfo.getTableClearTime());
table.setCreateTime(LocalDateTimeUtil.of(dateTime));
redisService.set(RedisCst.classKeyExpired.EXPIRED_TABLE + table.getId(), "", 60L * shopInfo.getTableClearTime());
}
shopTableService.updateById(table);
}
rabbitPublisher.sendOrderCancelMsg(orderInfo.getId().toString());
return true;
}
@@ -1690,6 +1702,18 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
orderInfoService.updateById(new OrderInfo().setId(orderId)
.setStatus(OrderStatusEnums.CANCELLED.getCode())
.setOriginAmount(BigDecimal.ZERO));
ShopTable table = shopTableService.getOneByTableCode(orderInfo.getShopId(), orderInfo.getTableCode());
if (table != null) {
ShopInfo shopInfo = shopInfoService.getById(orderInfo.getShopId());
if ("auto".equals(shopInfo.getTableClearType())) {
table.setStatus(ShopTableStatusEnum.IDLE.getValue());
} else {
DateTime dateTime = DateUtil.offsetMinute(DateUtil.date(), shopInfo.getTableClearTime());
table.setCreateTime(LocalDateTimeUtil.of(dateTime));
redisService.set(RedisCst.classKeyExpired.EXPIRED_TABLE + table.getId(), "", 60L * shopInfo.getTableClearTime());
}
shopTableService.updateById(table);
}
return true;
} else {
BigDecimal totalAmount = BigDecimal.ZERO;