czg_team
/
cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.代客下单 已出餐商品不支持操作

This commit is contained in:
SongZhang 2024-08-29 16:00:12 +08:00
parent 0facce27aa
commit ac82a2e447
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1114,7 +1114,11 @@ public class OrderService {
if (orderId > 0) { if (orderId > 0) {
TbOrderInfo orderInfo = tbOrderInfoMapper.selectByPrimaryKey(orderId); TbOrderInfo orderInfo = tbOrderInfoMapper.selectByPrimaryKey(orderId);
if (ids.isEmpty() && "postPay".equals(orderInfo.getUseType())) { if (ids.isEmpty() && "postPay".equals(orderInfo.getUseType())) {
return Result.success(CodeEnum.SUCCESS, proName + "商品已出餐，无法删除", null); if (StrUtil.isBlank(proName.toString())) {
return Result.success(CodeEnum.SUCCESS);
}else {
return Result.fail(proName + "已出餐，无法删除");
}
} }
// 返还耗材 // 返还耗材
@ -1151,7 +1155,11 @@ public class OrderService {
.eq(TbShopTable::getQrcode, cartVo.getTableId()) .eq(TbShopTable::getQrcode, cartVo.getTableId())
.set(TbShopTable::getStatus, TableStateEnum.IDLE.getState())); .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
return Result.success(CodeEnum.SUCCESS, proName + "商品已出餐，无法删除", null); if (StrUtil.isBlank(proName.toString())) {
return Result.success(CodeEnum.SUCCESS);
}else {
return Result.fail(proName + "已出餐，无法删除");
}
} }