新增创建订单 切换就餐模式接口
This commit is contained in:
@@ -1136,11 +1136,10 @@ public class CartService {
|
||||
}
|
||||
|
||||
// 去除餐位费信息
|
||||
cashierCartList = cashierCartList.stream().filter(item -> !"-999".equals(item.getProductId())).collect(Collectors.toList());
|
||||
|
||||
List<TbActivateOutRecord> outRecords = new ArrayList<>();
|
||||
for (TbCashierCart cashierCart : cashierCartList) {
|
||||
if (cashierCart.getIsVip().equals((byte) 1)) {
|
||||
if (!cashierCart.getProductId().equals("-999") && cashierCart.getIsVip().equals((byte) 1)) {
|
||||
List<TbActivateInRecord> actInRecords = activateInRecordService.queryAllByVipIdAndShopIdAndProId(
|
||||
Integer.valueOf(tbShopUser.getId()), Integer.valueOf(orderInfo.getShopId()), Integer.valueOf(cashierCart.getProductId()));
|
||||
Integer totalNumber = cashierCart.getTotalNumber();
|
||||
@@ -1170,6 +1169,9 @@ public class CartService {
|
||||
mpCashierCartMapper.updateById(cashierCart);
|
||||
}
|
||||
|
||||
cashierCartList = cashierCartList.stream().filter(item -> !"-999".equals(item.getProductId())).collect(Collectors.toList());
|
||||
|
||||
|
||||
// 删除旧的餐位费信息
|
||||
if (shopEatTypeInfoDTO.isTakeout() && seatCartInfo != null) {
|
||||
cashierCartMapper.deleteByPrimaryKey(seatCartInfo.getId());
|
||||
|
||||
Reference in New Issue
Block a user