From 0fe0722893e6245e5608af008b49648416bd88e4 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 29 Aug 2024 11:27:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?=
 =?UTF-8?q?=E6=8C=82=E8=B5=B7=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0masterId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/product/TbPlaceController.java    |  2 +-
 .../impl/shopimpl/TbShopTableServiceImpl.java    | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
index ce3bea56..df5936f4 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
@@ -143,7 +143,7 @@ public class TbPlaceController {
     public ResponseEntity<Object> createOrder(
            @RequestBody CreateOrderDTO createOrderDTO
     ) {
-        return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO, true));
+        return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO, !createOrderDTO.isPostPay()));
     }
 
     @AnonymousAccess
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 2bdb63b9..abae1be0 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -901,13 +901,16 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         if (isFirst) {
             // 后付费，不增加当前台桌取餐号
             if (createOrderDTO.isPostPay()) {
-//                addGlobalCode(day, "pc", String.valueOf(createOrderDTO.getShopId()));
-                String key = "SHOP:CODE:USER:pc" + ":" + createOrderDTO.getShopId() + ":" + day + ":" + orderInfo.getTableId();
-                redisTemplate.delete(key);
-            } else {
+                addGlobalCode(day, "pc", String.valueOf(createOrderDTO.getShopId()));
+//                String key = "SHOP:CODE:USER:pc" + ":" + createOrderDTO.getShopId() + ":" + day + ":" + orderInfo.getTableId();
+//                redisTemplate.delete(key);
+            }
+
+            if (!createOrderDTO.isPostPay() || addMaterId){
                 String key = "SHOP:CODE:USER:pc" + ":" + createOrderDTO.getShopId() + ":" + day + ":" + orderInfo.getTableId();
                 redisTemplate.delete(key);
             }
+
         }
 
         // 推送耗材信息
@@ -1021,6 +1024,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
             rabbitMsgUtils.printTicket(String.valueOf(orderId));
         }
+
         return orderInfoMapper.selectById(orderId);
     }
 
@@ -1097,9 +1101,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
         // 打印消息
         rabbitMsgUtils.sendOrderCollectMsg(jsonObject);
-        if (StrUtil.isBlank(orderInfo.getUseType()) || orderInfo.getUseType().equals("afterPay")) {
-            rabbitMsgUtils.printTicket(String.valueOf(orderInfo.getId()));
-        }
+        rabbitMsgUtils.printTicket(String.valueOf(orderInfo.getId()));
 
         // 发送库存记录mq消息
         JSONObject mqData = new JSONObject();