|
@@ -1653,6 +1653,11 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
if (tbOrder.getStatus().equals(3)) {
|
|
if (tbOrder.getStatus().equals(3)) {
|
|
|
return Result.success();
|
|
return Result.success();
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ if (tbOrder.getStatus().equals(6)) {
|
|
|
|
|
+ throw new SqxException("当前订单制作完成失败,非制作中订单不能制作完成。【订单id:" + tbOrder.getOrderId() + ",订单状态:" + tbOrder.getStatus() + "】");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
MessageInfo messageInfo = new MessageInfo();
|
|
MessageInfo messageInfo = new MessageInfo();
|
|
|
messageInfo.setTitle("餐品制作完成");
|
|
messageInfo.setTitle("餐品制作完成");
|
|
|
if (tbOrder.getOrderType() == 1) {
|
|
if (tbOrder.getOrderType() == 1) {
|