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

代客下单调整

Browse Source
This commit is contained in:
SongZhang
2024-09-26 15:54:27 +08:00
parent 1d5c6d7f69
commit fbb586b3a4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -1095,7 +1095,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
BigDecimal feeAmount = BigDecimal.ZERO; BigDecimal feeAmount = BigDecimal.ZERO;
BigDecimal saleAmount = BigDecimal.ZERO; BigDecimal saleAmount = BigDecimal.ZERO;
// 当前下单次数 // 当前下单次数
int placeNum = !shopEatTypeInfoDTO.isTakeout() ? getCurrentPlaceNum(createOrderDTO.getTableId(), createOrderDTO.getShopId().toString(), createOrderDTO.getUseType()) : 1; int placeNum = getCurrentPlaceNum(createOrderDTO.getTableId(), String.valueOf(createOrderDTO.getShopId()), createOrderDTO.getUseType());
List<TbOrderDetail> orderDetails = new ArrayList<>(); List<TbOrderDetail> orderDetails = new ArrayList<>();
BigDecimal mealAmount = null; BigDecimal mealAmount = null;
@@ -1146,7 +1146,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderId = cashierCart.getOrderId(); orderId = cashierCart.getOrderId();
} }
orderDetail.setOrderId(orderId); orderDetail.setOrderId(orderId);
orderDetail.setPlaceNum(placeNum);
orderDetails.add(orderDetail); orderDetails.add(orderDetail);
} }
@@ -1231,6 +1230,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderId = orderInfo.getId(); orderId = orderInfo.getId();
for (TbOrderDetail orderDetail : orderDetails) { for (TbOrderDetail orderDetail : orderDetails) {
orderDetail.setOrderId(orderId); orderDetail.setOrderId(orderId);
if (orderDetail.getPlaceNum() == null) {
orderDetail.setPlaceNum(placeNum);
}
} }
// 删除已经移除购物车的订单 修改并保存数据 // 删除已经移除购物车的订单 修改并保存数据
if (!orderDetails.isEmpty()) { if (!orderDetails.isEmpty()) {