From 9dc8ab767dc4820d6751d0fae948bcb707c9bfbf Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Wed, 9 Oct 2024 15:45:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BF=94=E5=9B=9E=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/vo/OrderVo.java            | 1 +
 .../system/cashierservice/service/OrderService.java         | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java
index cda221d..a5abc9e 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java
@@ -40,5 +40,6 @@ public class OrderVo {
     private String useType;
 
     private Integer shopId;
+    private String qrcode;
 
 }
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 ecb864c..0294163 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -15,6 +15,7 @@ import com.chaozhanggui.system.cashierservice.exception.MsgException;
 import com.chaozhanggui.system.cashierservice.mapper.MpCashierCartMapper;
 import com.chaozhanggui.system.cashierservice.mapper.MpOrderDetailMapper;
 import com.chaozhanggui.system.cashierservice.mapper.MpOrderInfoMapper;
+import com.chaozhanggui.system.cashierservice.mapper.MpShopInfoMapper;
 import com.chaozhanggui.system.cashierservice.rabbit.RabbitProducer;
 import com.chaozhanggui.system.cashierservice.redis.RedisCst;
 import com.chaozhanggui.system.cashierservice.redis.RedisUtil;
@@ -92,6 +93,8 @@ public class OrderService {
     private MpOrderDetailMapper mpOrderDetailMapper;
     @Autowired
     private MpOrderInfoMapper mpOrderInfoMapper;
+    @Autowired
+    private MpShopInfoMapper mpShopInfoMapper;
 
     /**
      * 创建订单
@@ -521,7 +524,8 @@ public class OrderService {
         orderVo.setOutNumber(orderInfo.getOutNumber());
         orderVo.setUseType(orderInfo.getUseType());
         orderVo.setShopId(Integer.valueOf(orderInfo.getShopId()));
-
+        TbShopInfo shopInfo = mpShopInfoMapper.selectById(orderInfo.getShopId());
+        orderVo.setQrcode(shopInfo == null ? null : shopInfo.getShopQrcode());
         Map<String, Object> map = new HashMap<>();
         // 餐位费
         map.put("seatFee", mealCashierCart);