打印

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")

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();

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>"));
         }