转桌 台桌名称
This commit is contained in:
@@ -564,6 +564,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
|
||||
.eq(OrderInfo::getTableCode, param.getTargetTableCode())
|
||||
.eq(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode()));
|
||||
if (targetOrder == null) {
|
||||
ShopTable shopTable = shopTableService.getOneByTableCode(sourceOrder.getShopId(), param.getTargetTableCode());
|
||||
OrderInfoAddDTO addDTO = new OrderInfoAddDTO();
|
||||
addDTO.setShopId(sourceOrder.getShopId());
|
||||
addDTO.setStaffId(sourceOrder.getStaffId());
|
||||
@@ -576,7 +577,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
|
||||
addDTO.setWaitCall(false);
|
||||
addDTO.setVipPrice(false);
|
||||
ShopInfo shopInfo = shopInfoService.getById(sourceOrder.getShopId());
|
||||
targetOrder = initOrderInfo(addDTO, shopInfo, null);
|
||||
targetOrder = initOrderInfo(addDTO, shopInfo, shopTable);
|
||||
} else {
|
||||
targetOrder.setPlaceNum(targetOrder.getPlaceNum() + 1);
|
||||
//下单次数+1
|
||||
@@ -1384,10 +1385,6 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
|
||||
} else {
|
||||
orderInfo.setOrderNo(param.getPlatformType() + CzgRandomUtils.snowflake());
|
||||
orderInfo.setShopId(param.getShopId());
|
||||
if (table != null) {
|
||||
orderInfo.setTableCode(table.getTableCode());
|
||||
orderInfo.setTableName(table.getName());
|
||||
}
|
||||
orderInfo.setRefundAmount(BigDecimal.ZERO);
|
||||
orderInfo.setPayAmount(BigDecimal.ZERO);
|
||||
|
||||
@@ -1409,6 +1406,10 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
|
||||
//取餐码 多端一致
|
||||
orderInfo.setTakeCode(getCode(shopInfo.getId()));
|
||||
}
|
||||
if (table != null) {
|
||||
orderInfo.setTableCode(table.getTableCode());
|
||||
orderInfo.setTableName(table.getName());
|
||||
}
|
||||
// 餐位费
|
||||
if (shopInfo.getIsTableFee().equals(0)) {
|
||||
orderInfo.setSeatAmount(shopInfo.getTableFee().multiply(new BigDecimal(param.getSeatNum())));
|
||||
|
||||
Reference in New Issue
Block a user