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

上菜时间完善

Browse Source
This commit is contained in:
张松
2025-11-27 11:50:18 +08:00
parent 1fb523e4b6
commit 8edb49a270
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -294,6 +294,11 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
if ("URGENT".equals(param.getSubStatus())) { if ("URGENT".equals(param.getSubStatus())) {
orderDetails.forEach(item -> item.setUrgent(true)); orderDetails.forEach(item -> item.setUrgent(true));
}else { }else {
switch (EnumUtil.fromString(TableValueConstant.OrderDetail.SubStatus.class, param.getSubStatus())) {
case TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE:
orderDetails.forEach(item -> item.setStartOrderTime(DateUtil.date().toLocalDateTime()));
break;
}
orderDetails.forEach(item -> item.setSubStatus(param.getSubStatus())); orderDetails.forEach(item -> item.setSubStatus(param.getSubStatus()));
} }
} }
@@ -1721,8 +1726,6 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
OrderDetail orderDetail = orderDetailService.getById(orderDetailId); OrderDetail orderDetail = orderDetailService.getById(orderDetailId);
if (orderDetail == null) { if (orderDetail == null) {
log.warn("订单详情不存在"); log.warn("订单详情不存在");
}
if (orderDetail.getSubStatus() == null) {
return; return;
} }
@@ -1736,9 +1739,11 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
switch (EnumUtil.fromString(TableValueConstant.OrderDetail.SubStatus.class, orderDetail.getSubStatus())) { switch (EnumUtil.fromString(TableValueConstant.OrderDetail.SubStatus.class, orderDetail.getSubStatus())) {
case TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE: case TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE:
orderDetail.setSubStatus(TableValueConstant.OrderDetail.SubStatus.SENT_OUT.getCode()); orderDetail.setSubStatus(TableValueConstant.OrderDetail.SubStatus.SENT_OUT.getCode());
orderDetail.setDishOutTime(DateUtil.date().toLocalDateTime());
break; break;
case TableValueConstant.OrderDetail.SubStatus.SENT_OUT: case TableValueConstant.OrderDetail.SubStatus.SENT_OUT:
orderDetail.setSubStatus(TableValueConstant.OrderDetail.SubStatus.DELIVERED.getCode()); orderDetail.setSubStatus(TableValueConstant.OrderDetail.SubStatus.DELIVERED.getCode());
orderDetail.setFoodServeTime(DateUtil.date().toLocalDateTime());
} }
orderDetailService.updateById(orderDetail); orderDetailService.updateById(orderDetail);
@@ -1753,16 +1758,19 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
.eq(OrderDetail::getShopId, shopId)); .eq(OrderDetail::getShopId, shopId));
AssertUtil.isNull(detail, "订单详情不存在"); AssertUtil.isNull(detail, "订单详情不存在");
orderDetailService.updateChain().set(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode()) orderDetailService.updateChain().set(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode())
.set(OrderDetail::getStartOrderTime, DateUtil.date().toLocalDateTime())
.eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId()).update(); .eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId()).update();
// 上菜 // 上菜
} else { } else {
if (detailStatusDTO.getOrderId() != null) { if (detailStatusDTO.getOrderId() != null) {
orderDetailService.updateChain().eq(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode()) orderDetailService.updateChain().eq(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode())
.set(OrderDetail::getFoodServeTime, DateUtil.date().toLocalDateTime())
.set(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.SENT_OUT.getCode()) .set(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.SENT_OUT.getCode())
.eq(OrderDetail::getOrderId, detailStatusDTO.getOrderId()).update(); .eq(OrderDetail::getOrderId, detailStatusDTO.getOrderId()).update();
} else { } else {
orderDetailService.updateChain().eq(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode()) orderDetailService.updateChain().eq(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode())
.set(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.SENT_OUT.getCode()) .set(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.SENT_OUT.getCode())
.set(OrderDetail::getFoodServeTime, DateUtil.date().toLocalDateTime())
.eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId()).update(); .eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId()).update();
} }
} }