feat: 添加购物车简化修改
This commit is contained in:
@@ -397,7 +397,7 @@ public class OrderService {
|
|||||||
|
|
||||||
List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create");
|
List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create");
|
||||||
|
|
||||||
TbCashierCart cashierCart = getCashierInfo(shopId, skuId, productId, tableId, masterId, shopEatTypeInfoDTO);
|
TbCashierCart cashierCart = getCashierInfo(shopId, skuId, productId, tableId, masterId, shopEatTypeInfoDTO, cartId);
|
||||||
if (type.equals("edit") && cashierCart!= null) {
|
if (type.equals("edit") && cashierCart!= null) {
|
||||||
cashierCart.setNumber(number);
|
cashierCart.setNumber(number);
|
||||||
if (product != null) {
|
if (product != null) {
|
||||||
@@ -482,7 +482,7 @@ public class OrderService {
|
|||||||
return Result.success(CodeEnum.SUCCESS, masterId);
|
return Result.success(CodeEnum.SUCCESS, masterId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private TbCashierCart getCashierInfo(Object shopId, Object skuId, Object productId, String tableId, String MasterId, ShopEatTypeInfoDTO shopEatTypeInfoDTO) {
|
private TbCashierCart getCashierInfo(Object shopId, Object skuId, Object productId, String tableId, String MasterId, ShopEatTypeInfoDTO shopEatTypeInfoDTO, Integer cartId) {
|
||||||
LambdaQueryWrapper<TbCashierCart> query = new LambdaQueryWrapper<TbCashierCart>()
|
LambdaQueryWrapper<TbCashierCart> query = new LambdaQueryWrapper<TbCashierCart>()
|
||||||
.eq(TbCashierCart::getShopId, shopId)
|
.eq(TbCashierCart::getShopId, shopId)
|
||||||
.eq(TbCashierCart::getSkuId, skuId)
|
.eq(TbCashierCart::getSkuId, skuId)
|
||||||
@@ -490,6 +490,10 @@ public class OrderService {
|
|||||||
.in(TbCashierCart::getStatus, "create")
|
.in(TbCashierCart::getStatus, "create")
|
||||||
.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType());
|
.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType());
|
||||||
|
|
||||||
|
if (cartId != null) {
|
||||||
|
query.eq(TbCashierCart::getId, cartId);
|
||||||
|
}
|
||||||
|
|
||||||
if (shopEatTypeInfoDTO.isDineInAfter()) {
|
if (shopEatTypeInfoDTO.isDineInAfter()) {
|
||||||
query.isNull(TbCashierCart::getPlaceNum);
|
query.isNull(TbCashierCart::getPlaceNum);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user