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

fix: 创建订单修改

This commit is contained in:
SongZhang 2024-10-29 16:28:34 +08:00
parent a531fa2445
commit fe7e8d4ed9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@ -739,8 +739,6 @@ public class OrderService {
// 获取当前台桌最新订单，先付款模式不获取 // 获取当前台桌最新订单，先付款模式不获取
String currentOrderKey = RedisCst.getCurrentOrderKey(orderVo.getTableId(), orderVo.getShopId().toString()); String currentOrderKey = RedisCst.getCurrentOrderKey(orderVo.getTableId(), orderVo.getShopId().toString());
TbOrderInfo orderInfo = getCurrentOrder(eatTypeInfoDTO, orderVo.getTableId(), orderVo.getShopId());
Integer orderId = orderInfo == null ? null : orderInfo.getId();
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>() LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, orderVo.getShopId()) .eq(TbCashierCart::getShopId, orderVo.getShopId())
@ -787,8 +785,11 @@ public class OrderService {
ArrayList<Integer> cashierIds = new ArrayList<>(); ArrayList<Integer> cashierIds = new ArrayList<>();
// 就餐人数 // 就餐人数
Integer mealNum = null; Integer mealNum = null;
Integer orderId = null;
for (TbCashierCart cart : list) { for (TbCashierCart cart : list) {
if (StrUtil.isNotBlank(cart.getOrderId())) {
orderId = Integer.valueOf(cart.getOrderId());
}
cashierIds.add(cart.getId()); cashierIds.add(cart.getId());
if ("-999".equals(cart.getProductId())) { if ("-999".equals(cart.getProductId())) {
mealNum = cart.getNumber(); mealNum = cart.getNumber();
@ -901,6 +902,10 @@ public class OrderService {
// 创建订单 // 创建订单
String orderNo = generateOrderNumber(); String orderNo = generateOrderNumber();
TbToken tbToken = tokenMapper.selectByToken(token); TbToken tbToken = tokenMapper.selectByToken(token);
TbOrderInfo orderInfo = null;
if (orderId != null) {
orderInfo = mPOrderInfoMapper.selectById(orderId);
}
if (orderInfo == null || !"unpaid".equals(orderInfo.getStatus())) { if (orderInfo == null || !"unpaid".equals(orderInfo.getStatus())) {
redisUtil.deleteByKey(currentOrderKey); redisUtil.deleteByKey(currentOrderKey);
} }