diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index 24bd3e9..949e60c 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -354,13 +354,11 @@ public class OrderService { } } boolean needNew = false; - boolean isGroup = false; List list = cashierCartMapper.selectALlByMasterId(masterId, "create"); TbCashierCart cashierCart = null; if (type.equals("edit")) { cashierCart = getCashierInfo(shopId, skuId, productId, tableId, masterId, shopEatTypeInfoDTO, cartId); - isGroup = cashierCart != null && cashierCart.getGroupType() != null && cashierCart.getGroupType() == 1; - if (cashierCart == null || isGroup) { + if (cashierCart == null) { needNew = true; } else { // 校验是否是代客下单往期订单 @@ -424,7 +422,7 @@ public class OrderService { cashierCart = getCashierInfo(shopId, skuId, productId, tableId, masterId, shopEatTypeInfoDTO, cartId); } - if (cashierCart != null && !isGroup) { + if (cashierCart != null) { // 校验是否是代客下单往期订单 if (shopEatTypeInfoDTO.isDineInAfter() && cashierCart.getPlaceNum() != null && !isSeatCart) { return Result.fail("后付费已下单订单仅支持退款");