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

空指针

Browse Source
This commit is contained in:
wangw
2025-12-03 09:27:01 +08:00
parent 9942a47bd3
commit 990bd5b144
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -296,7 +296,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
item.setUrgent(true); item.setUrgent(true);
item.setSubStatus(TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode()); item.setSubStatus(TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode());
}); });
}else { } else {
switch (EnumUtil.fromString(TableValueConstant.OrderDetail.SubStatus.class, param.getSubStatus())) { switch (EnumUtil.fromString(TableValueConstant.OrderDetail.SubStatus.class, param.getSubStatus())) {
case TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE: case TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE:
orderDetails.forEach(item -> item.setStartOrderTime(DateUtil.date().toLocalDateTime())); orderDetails.forEach(item -> item.setStartOrderTime(DateUtil.date().toLocalDateTime()));
@@ -1445,7 +1445,11 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
} else { } else {
orderInfo.setOrderAmount(BigDecimal.ZERO); orderInfo.setOrderAmount(BigDecimal.ZERO);
} }
orderInfo.setPackFee(orderInfo.getPackFee().add(param.getPackFee())); if (orderInfo.getPackFee() == null) {
orderInfo.setPackFee(param.getPackFee());
} else {
orderInfo.setPackFee(orderInfo.getPackFee().add(param.getPackFee()));
}
orderInfo.setRoundAmount(BigDecimal.ZERO); orderInfo.setRoundAmount(BigDecimal.ZERO);
orderInfo.setPointsNum(0); orderInfo.setPointsNum(0);
orderInfoService.saveOrUpdate(orderInfo); orderInfoService.saveOrUpdate(orderInfo);
@@ -1762,11 +1766,11 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
OrderDetail detail = orderDetailService.getOne(new QueryWrapper().eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId()) OrderDetail detail = orderDetailService.getOne(new QueryWrapper().eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId())
.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()) .set(OrderDetail::getStartOrderTime, DateUtil.date().toLocalDateTime())
.eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId()).update(); .eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId()).update();
// 上菜 // 上菜
}else if(detailStatusDTO.getType() == 2) { } else if (detailStatusDTO.getType() == 2) {
boolean update = orderDetailService.updateChain() boolean update = orderDetailService.updateChain()
.eq(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode()) .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())
@@ -1774,7 +1778,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
.eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId()).update(); .eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId()).update();
AssertUtil.isTrue(!update, "已出菜，请勿重复出菜"); AssertUtil.isTrue(!update, "已出菜，请勿重复出菜");
}else { } else {
if (detailStatusDTO.getOrderId() != null) { if (detailStatusDTO.getOrderId() != null) {
orderDetailService.updateChain() orderDetailService.updateChain()
.set(OrderDetail::getFoodServeTime, DateUtil.date().toLocalDateTime()) .set(OrderDetail::getFoodServeTime, DateUtil.date().toLocalDateTime())