fix: 创建订单修改

src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java

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