From 8010ee3ffe5a3511777a8632e545c946a9231847 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 29 Oct 2024 10:52:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0registerType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/OrderService.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 dc4c5ed..8008b70 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -464,8 +464,8 @@ public class OrderService {
             return Result.fail("订单不存在");
         }
 
-        TbShopInfo tbShopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
-        if (tbShopInfo == null) {
+        TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
+        if (shopInfo == null) {
             return Result.fail("店铺不存在");
         }
 
@@ -504,10 +504,10 @@ public class OrderService {
         TbShopTable tbShopTable = shopTableMapper.selectQRcode(orderInfo.getTableId());
 
         OrderVo orderVo = new OrderVo();
-        orderVo.setName(tbShopInfo.getShopName());
+        orderVo.setName(shopInfo.getShopName());
         orderVo.setStatus(orderInfo.getStatus());
         //TODO 增加商家二维码
-        orderVo.setShopQrcode(tbShopInfo.getShopQrcode());
+        orderVo.setShopQrcode(shopInfo.getShopQrcode());
         orderVo.setDetails(list);
         orderVo.setOrderNo(orderInfo.getOrderNo());
         orderVo.setTime(orderInfo.getCreatedAt());
@@ -526,8 +526,7 @@ 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());
+        orderVo.setQrcode(shopInfo.getShopQrcode());
         Map<String, Object> map = new HashMap<>();
         // 餐位费
         map.put("seatFee", mealCashierCart);
@@ -536,6 +535,7 @@ public class OrderService {
         map.putAll(BeanUtil.beanToMap(orderVo, false, false));
         map.put("createdAt", DateUtil.formatDateTime(DateUtil.date(orderInfo.getCreatedAt())));
         map.put("paidTime", orderInfo.getPaidTime() == null ? null : DateUtil.formatDateTime(DateUtil.date(orderInfo.getPaidTime())));
+        map.put("registerType", shopInfo.getRegisterType());
         return map;
     }
 }