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

fix: 修复打包未计算的问题

This commit is contained in:
张松 2024-11-06 17:18:50 +08:00
parent 77b9b0c409
commit 6c5940c6ea
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2187,16 +2187,20 @@ public class TbShopTableServiceImpl implements TbShopTableService {
}
}
TbOrderInfo orderInfo = mpOrderInfoService.getById(orderId);
if(!TableConstant.OrderInfo.Status.UNPAID.equalsVals(orderInfo.getStatus())) {
throw new BadRequestException("订单状态异常");
CreateOrderDTO dto = null;
if (orderId != null) {
TbOrderInfo orderInfo = mpOrderInfoService.getById(orderId);
if(!TableConstant.OrderInfo.Status.UNPAID.equalsVals(orderInfo.getStatus())) {
throw new BadRequestException("订单状态异常");
}
dto = new CreateOrderDTO();
dto.setTableId(orderInfo.getTableId());
dto.setOrderId(orderInfo.getId());
dto.setShopId(Integer.valueOf(orderInfo.getShopId()));
dto.setMasterId(orderInfo.getMasterId());
dto.setUseType(orderInfo.getUseType());
}
CreateOrderDTO dto = new CreateOrderDTO();
dto.setTableId(orderInfo.getTableId());
dto.setOrderId(orderInfo.getId());
dto.setShopId(Integer.valueOf(orderInfo.getShopId()));
dto.setMasterId(orderInfo.getMasterId());
dto.setUseType(orderInfo.getUseType());
if (updateVipDTO.getType() == 0) {
TbShopUser shopUser = tbShopUserMapper.selectById(updateVipDTO.getVipUserId());
@ -2217,7 +2221,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.set(TbOrderInfo::getMemberId, null));
}
return createOrder(dto, true);
if (dto != null) {
return createOrder(dto, true);
}
return "";
}