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

fix: 只选择餐位费不允许创建订单

Browse Source
This commit is contained in:
张松
2024-11-07 11:11:56 +08:00
parent 873aa9fc89
commit d448e25fc8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -824,6 +824,7 @@ public class OrderService {
// 就餐人数 // 就餐人数
Integer mealNum = null; Integer mealNum = null;
Integer orderId = null; Integer orderId = null;
int cartCount = 0;
for (TbCashierCart cart : list) { for (TbCashierCart cart : list) {
if (StrUtil.isNotBlank(cart.getOrderId())) { if (StrUtil.isNotBlank(cart.getOrderId())) {
orderId = Integer.valueOf(cart.getOrderId()); orderId = Integer.valueOf(cart.getOrderId());
@@ -832,6 +833,10 @@ public class OrderService {
if ("-999".equals(cart.getProductId())) { if ("-999".equals(cart.getProductId())) {
mealNum = cart.getNumber(); mealNum = cart.getNumber();
} }
if (TableConstant.OrderInfo.Status.CREATE.equalsVals(cart.getStatus()) && !TableConstant.CashierCart.ID.equals(cart.getProductId())) {
cartCount++;
}
} }
if (eatTypeInfoDTO.isNeedSeatFee() && mealNum == null) { if (eatTypeInfoDTO.isNeedSeatFee() && mealNum == null) {
@@ -839,7 +844,7 @@ public class OrderService {
} }
list = list.stream().filter(item -> TableConstant.OrderInfo.Status.CREATE.equalsVals(item.getStatus())).collect(Collectors.toList()); list = list.stream().filter(item -> TableConstant.OrderInfo.Status.CREATE.equalsVals(item.getStatus())).collect(Collectors.toList());
if (eatTypeInfoDTO.isNeedSeatFee() && list.size() < 2) { if (cartCount == 0) {
return Result.fail("购物车为空"); return Result.fail("购物车为空");
} }