From 45b5566e87576f7beb44ddb3461a4321184ab1f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com>
Date: Mon, 22 Jul 2024 11:09:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/controller/PayController.java   |  2 +-
 .../system/cashierservice/service/CartService.java | 14 +++++++-------
 .../system/cashierservice/util/PrinterUtils.java   |  5 +++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
index fa090d4..79db6f6 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
@@ -160,7 +160,7 @@ public class PayController {
                                   @RequestParam("userId") String userId,
                                   @RequestParam("shopId") String shopId
     ) {
-        return payService.getShopByMember(userId,shopId,page,pageSize);
+            return payService.getShopByMember(userId,shopId,page,pageSize);
     }
 
     @RequestMapping("queryMemberAccount")
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
index bbb067f..58f1396 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -777,13 +777,6 @@ public class CartService {
                 object.put("updatedAt", System.currentTimeMillis());
                 object.put("orderId", orderId + "");
 
-                // 发送mq消息
-                JSONObject jsonObject2 = new JSONObject();
-                jsonObject2.put("orderId", orderInfo.getId());
-                jsonObject2.put("type", "create");
-                jsonObject2.put("cartId", cashierCart.getId());
-                log.info("开始发送mq消息，消耗耗材，消息内容：{}", jsonObject2);
-                producer.cons(jsonObject2.toString());
             }
             redisUtil.saveMessage(RedisCst.TABLE_CART.concat(jsonObject.getString("tableId")).concat("-").concat(shopId), array.toJSONString());
             orderInfo.setDetailList(orderDetails);
@@ -806,6 +799,13 @@ public class CartService {
             redisUtil.saveMessage(RedisCst.ORDER_EXPIRED.concat(orderId.toString()), orderId.toString(), 60 * 16L);
 
 
+            // 发送mq消息
+            JSONObject jsonObject2 = new JSONObject();
+            jsonObject2.put("orderId", orderId);
+            jsonObject2.put("type", "create");
+            log.info("开始发送mq消息，消耗耗材，消息内容：{}", jsonObject2);
+            producer.cons(jsonObject2.toString());
+
         } catch (Exception e) {
             log.info("长链接错误 addCart{}", e.getMessage());
             e.printStackTrace();
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
index 6a0c1a6..16f3cbd 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
@@ -140,6 +140,11 @@ public class PrinterUtils {
         sb.append("<S>余额:"+detailPO.getBalance()+"</S><BR>");
         sb.append("------------------------<BR>");
 
+
+        if(ObjectUtil.isNotEmpty(detailPO.getRemark())&&ObjectUtil.isNotNull(detailPO.getRemark())){
+            sb.append("<L>备注:"+detailPO.getRemark()+"</L><BR>");
+        }
+
         if(Objects.nonNull(detailPO.getOutNumber())){
             sb.append("<QR>".concat(detailPO.getOutNumber()).concat("</QR><BR>"));
         }