From c0cad47e51590cd3b1fd1614e510272130679235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Wed, 19 Jun 2024 15:10:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8D=B0=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=96=E9=A4=90=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/controller/CloudPrinterController.java     | 3 +++
 .../system/cashierservice/model/OrderDetailPO.java            | 2 ++
 .../system/cashierservice/rabbit/PrintMechineConsumer.java    | 1 +
 .../system/cashierservice/service/PayService.java             | 3 ++-
 .../chaozhanggui/system/cashierservice/util/PrinterUtils.java | 4 ++++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/CloudPrinterController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/CloudPrinterController.java
index 529ff58..1a33f05 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/CloudPrinterController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/CloudPrinterController.java
@@ -7,6 +7,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+/**
+ * @author admin
+ */
 @CrossOrigin(origins = "*")
 @RestController
 @Slf4j
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/model/OrderDetailPO.java b/src/main/java/com/chaozhanggui/system/cashierservice/model/OrderDetailPO.java
index 1a2b8cb..b3b22d6 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/model/OrderDetailPO.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/model/OrderDetailPO.java
@@ -32,6 +32,8 @@ public class OrderDetailPO implements Serializable {
 
     private String remark;
 
+    private String outNumber;
+
 
     @Data
     public static class Detail implements Serializable{
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 26b1f66..1657918 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
@@ -172,6 +172,7 @@ public class PrintMechineConsumer {
                             if(ObjectUtil.isNotEmpty(detailList)&&detailList.size()>0){
 
                                 OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", orderInfo.getTableName(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance, orderInfo.getPayType(), "0", detailList,orderInfo.getRemark());
+                                detailPO.setOutNumber(orderInfo.getOutNumber());
                                 String data=   PrinterUtils.getCashPrintData(detailPO,"结算单");
                                 PrinterUtils.printTickets(1, Integer.valueOf(printerNum), tbPrintMachineWithBLOBs.getAddress(), data);
                             }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 0d11de7..6e4815a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.chaozhanggui.system.cashierservice.dao.*;
 import com.chaozhanggui.system.cashierservice.entity.*;
 import com.chaozhanggui.system.cashierservice.entity.dto.ReturnGroupOrderDto;
+import com.chaozhanggui.system.cashierservice.entity.vo.ShopUserListVo;
 import com.chaozhanggui.system.cashierservice.exception.MsgException;
 import com.chaozhanggui.system.cashierservice.model.PayReq;
 import com.chaozhanggui.system.cashierservice.model.TradeQueryReq;
@@ -962,7 +963,7 @@ public class PayService {
 
     public Result getShopByMember(String userId,String shopId,int page,int pageSize){
         PageHelper.startPage(page, pageSize);
-        List<Map<String,Object>> list= tbShopUserMapper.selectByUserId(userId,shopId);
+        List<ShopUserListVo> list= tbShopUserMapper.selectByUserId(userId,shopId);
         PageInfo pageInfo=new PageInfo(list);
         return Result.success(CodeEnum.SUCCESS,pageInfo);
     }
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 66145ee..1573255 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
@@ -131,6 +131,10 @@ public class PrinterUtils {
         sb.append("<S>余额:"+detailPO.getBalance()+"</S><BR>");
         sb.append("------------------------<BR>");
 
+        if(Objects.nonNull(detailPO.getOutNumber())){
+            sb.append("<QR>".concat(detailPO.getOutNumber()).concat("</QR><BR>"));
+        }
+
         sb.append("<S>打印时间:"+DateUtils.getTime(new Date())+"</S><BR>");
 
         sb.append("<OUT:180>");