czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

转桌 台桌名称

Browse Source
This commit is contained in:
wangw
2026-03-26 10:53:37 +08:00
parent 82e40dc82a
commit 6079b7f4ec
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
View File

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