From 4101c5235bb43b657f2f1de4c023e858405ec8fe Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sat, 31 Aug 2024 16:45:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=8E=B7=E5=8F=96=E6=A1=8C=E7=A0=81=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87tableId=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/controller/OrderController.java  | 3 ++-
 .../system/cashierservice/rabbit/PrintMechineConsumer.java | 5 ++---
 .../system/cashierservice/service/OrderService.java        | 7 +++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
index c44fe72..44f0171 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
@@ -79,11 +79,12 @@ public class OrderController {
                             @RequestHeader("loginName") String loginName,
                             @RequestHeader("clientType") String clientType,
                             @RequestParam("shopId") String shopId,
+                             @RequestParam(required = false) String tableId,
                              String type
     ){
         JSONObject jsonObject  = TokenUtil.parseParamFromToken(token);
         String userId = jsonObject.getString("accountId");
-        return orderService.createCode(shopId,clientType,userId,type);
+        return orderService.createCode(shopId,clientType,userId,type, tableId);
     }
     @GetMapping("/getCartList")
     public Result getCart(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
index 4be8ae3..5d07918 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
@@ -90,7 +90,7 @@ public class PrintMechineConsumer {
             }
 
 
-            list.parallelStream().forEach(it -> {
+            list.forEach(it -> {
                 if (!"network".equals(it.getConnectionType())) {
                     log.error("非网络打印机:{},{}", it.getAddress(), it.getConnectionType());
                     return;
@@ -197,8 +197,7 @@ public class PrintMechineConsumer {
                             return;
                         }
 
-                        if (StrUtil.isNotBlank(orderInfo.getUseType()) && orderInfo.getUseType().equals("postPay")
-                                && (!orderInfo.getStatus().equals("closed"))) {
+                        if ((!orderInfo.getStatus().equals("closed"))) {
                             return;
                         }
                         List<TbOrderDetail> tbOrderDetails = tbOrderDetailMapper.selectAllByOrderId(Integer.valueOf(orderId));
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index 22ccbc8..e44d3ff 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -654,6 +654,7 @@ public class OrderService {
             return Result.fail(CARTEXIST);
         }
 
+
         for (TbCashierCart cashierCart : list) {
 
             TbProductSkuWithBLOBs tbProduct = tbProductSkuMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getSkuId()));
@@ -719,6 +720,7 @@ public class OrderService {
             orderInfo.setUserId(orderVo.getUserId());
             orderInfo.setUseType(StrUtil.isNotBlank(orderVo.getTableId()) ? "postPay" : "afterPay");
             orderInfo.setTableName(shopTable != null ? shopTable.getName() : null);
+            orderInfo.setPayAmount(BigDecimal.ZERO);
 
             if (StrUtil.isNotBlank(orderVo.getTableId())) {
                 orderInfo.setTableId(orderVo.getTableId());
@@ -883,10 +885,11 @@ public class OrderService {
         return orderCode;
     }
 
-    public Result createCode(String shopId, String clientType, String userId, String type) {
+    public Result createCode(String shopId, String clientType, String userId, String type, String tableId) {
         String day = DateUtils.getDay();
         JSONObject jsonObject = new JSONObject();
-        String key="SHOP:CODE:USER:" + clientType + ":" + shopId + ":" + day + userId;
+//        String key="SHOP:CODE:USER:" + clientType + ":" + shopId + ":" + day + userId;
+        String key="SHOP:CODE:USER:" + clientType + ":" + shopId + ":" + day + ":" + tableId;
         String userCode = redisUtil.getMessage(key)+"";
         if ("1".equals(type)) {
             String code = "#" + generateOrderCode(day, clientType, shopId);