From e74fc42cf7cea08df244389e14cda11c8aa4d566 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 11 Oct 2024 14:46:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/controller/order/TbOrderInfoController.java    | 3 ++-
 .../cashier/service/impl/order/TbOrderInfoServiceImpl.java | 7 +++++--
 .../cn/ysk/cashier/service/order/TbOrderInfoService.java   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java
index 3fe11b9c..fca15114 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java
@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
 * @website https://eladmin.vip
@@ -54,7 +55,7 @@ public class TbOrderInfoController {
 
     @GetMapping("/{id}")
     @ApiOperation("通过Id查询订单")
-    public TbOrderInfoDto queryTbOrderInfo(@PathVariable("id") Integer id){
+    public Map<String, Object> queryTbOrderInfo(@PathVariable("id") Integer id){
         return tbOrderInfoService.findById(id);
     }
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
index 35c520ba..4ccaded6 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.ysk.cashier.service.impl.order;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import cn.ysk.cashier.cons.TableConstant;
@@ -257,7 +258,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
 
     @Override
     @Transactional
-    public TbOrderInfoDto findById(Integer id) {
+    public Map<String, Object> findById(Integer id) {
         TbOrderInfo tbOrderInfo = tbOrderInfoRepository.findById(id).orElseGet(TbOrderInfo::new);
         ValidationUtil.isNull(tbOrderInfo.getId(), "TbOrderInfo", "id", id);
         TbOrderInfoDto dto = tbOrderInfoMapper.toDto(tbOrderInfo);
@@ -296,7 +297,9 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
         dto.setDetailList(details);
         TbCashierCart cashierCart = tbCashierCartMapper.selectOne(new LambdaQueryWrapper<TbCashierCart>().eq(TbCashierCart::getOrderId, id).eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID));
         dto.setSeatInfo(cashierCart);
-        return dto;
+        Map<String, Object> data = BeanUtil.beanToMap(tbOrderInfo, false, false);
+        data.putAll(BeanUtil.beanToMap(dto, false, false));
+        return data;
     }
 
     @Override
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderInfoService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderInfoService.java
index 5e89ef1e..dd7c0af5 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderInfoService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderInfoService.java
@@ -62,7 +62,7 @@ public interface TbOrderInfoService {
      * @param id ID
      * @return TbOrderInfoDto
      */
-    TbOrderInfoDto findById(Integer id);
+    Map<String, Object> findById(Integer id);
 
     /**
     * 创建