feat: 添加购物车修改
This commit is contained in:
@@ -354,13 +354,11 @@ public class OrderService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
boolean needNew = false;
|
boolean needNew = false;
|
||||||
boolean isGroup = false;
|
|
||||||
List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create");
|
List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create");
|
||||||
TbCashierCart cashierCart = null;
|
TbCashierCart cashierCart = null;
|
||||||
if (type.equals("edit")) {
|
if (type.equals("edit")) {
|
||||||
cashierCart = getCashierInfo(shopId, skuId, productId, tableId, masterId, shopEatTypeInfoDTO, cartId);
|
cashierCart = getCashierInfo(shopId, skuId, productId, tableId, masterId, shopEatTypeInfoDTO, cartId);
|
||||||
isGroup = cashierCart != null && cashierCart.getGroupType() != null && cashierCart.getGroupType() == 1;
|
if (cashierCart == null) {
|
||||||
if (cashierCart == null || isGroup) {
|
|
||||||
needNew = true;
|
needNew = true;
|
||||||
} else {
|
} else {
|
||||||
// 校验是否是代客下单往期订单
|
// 校验是否是代客下单往期订单
|
||||||
@@ -424,7 +422,7 @@ public class OrderService {
|
|||||||
cashierCart = getCashierInfo(shopId, skuId, productId, tableId, masterId, shopEatTypeInfoDTO, cartId);
|
cashierCart = getCashierInfo(shopId, skuId, productId, tableId, masterId, shopEatTypeInfoDTO, cartId);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cashierCart != null && !isGroup) {
|
if (cashierCart != null) {
|
||||||
// 校验是否是代客下单往期订单
|
// 校验是否是代客下单往期订单
|
||||||
if (shopEatTypeInfoDTO.isDineInAfter() && cashierCart.getPlaceNum() != null && !isSeatCart) {
|
if (shopEatTypeInfoDTO.isDineInAfter() && cashierCart.getPlaceNum() != null && !isSeatCart) {
|
||||||
return Result.fail("后付费已下单订单仅支持退款");
|
return Result.fail("后付费已下单订单仅支持退款");
|
||||||
|
|||||||
Reference in New Issue
Block a user