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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
牛叉闪闪
2024-08-29 15:52:30 +08:00
parent 35b9132eda 12b87312fd
commit 92c4f1ca3a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,7 +150,7 @@ public class OrderService {
} }
TbCashierCart cart = cashierCartMapper.selectByPrimaryKey(cartId); TbCashierCart cart = cashierCartMapper.selectByPrimaryKey(cartId);
if (cart != null && cart.getNumber() < number && StrUtil.isNotBlank(cart.getOrderId()) && StrUtil.isNotBlank(cart.getTableId())) { if (cart != null && cart.getNumber() > number && StrUtil.isNotBlank(cart.getOrderId()) && StrUtil.isNotBlank(cart.getTableId())) {
return Result.fail("此商品已经出餐不支持减少操作"); return Result.fail("此商品已经出餐不支持减少操作");
} }
@@ -1082,9 +1082,11 @@ public class OrderService {
List<ProductSkuPo> productSkuPos = new ArrayList<>(); List<ProductSkuPo> productSkuPos = new ArrayList<>();
List<String> skuIds = new ArrayList<>(); List<String> skuIds = new ArrayList<>();
ArrayList<Integer> ids = new ArrayList<>(); ArrayList<Integer> ids = new ArrayList<>();
StringBuilder proName = new StringBuilder();
for (TbCashierCart cashierCart : list) { for (TbCashierCart cashierCart : list) {
if (StrUtil.isNotBlank(cashierCart.getOrderId()) && StrUtil.isNotBlank(cashierCart.getTableId())) { if (StrUtil.isNotBlank(cashierCart.getOrderId()) && StrUtil.isNotBlank(cashierCart.getTableId())) {
orderId = Integer.parseInt(cashierCart.getOrderId()); orderId = Integer.parseInt(cashierCart.getOrderId());
proName.append(cashierCart.getName()).append(",");
continue; continue;
} }
@@ -1149,7 +1151,7 @@ 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); return Result.success(CodeEnum.SUCCESS, proName + "商品已出餐，无法删除", null);
} }