From ce94bd7e4e2bcc37df7e7acd507be93aa4eccb3d Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sat, 26 Oct 2024 13:51:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=A4=90=E4=BD=8D=E8=B4=B9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/service/impl/order/TbOrderInfoServiceImpl.java  | 6 +++---
 .../src/main/java/cn/ysk/cashier/vo/TbOrderInfoVo.java      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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 439afeab..430b540f 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
@@ -172,7 +172,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
         for (TbOrderInfo tbOrderInfo : page.getContent()) {
             TbOrderInfoVo orderInfoVo = new TbOrderInfoVo();
             BigDecimal refundAmount = BigDecimal.ZERO;
-            List<TbOrderDetail> details = tbOrderDetailRepository.searchDetailByOrderId(tbOrderInfo.getId());
+            List<TbFullOrderDetail> details = tbOrderDetailMapper.selectFullInfoByOrderId(tbOrderInfo.getId());
             if (!tbOrderInfo.getOrderType().equals("return")) {
                 List<TbOrderInfo> tbOrderInfos = tbOrderInfoRepository.selTbOrdersBysource(tbOrderInfo.getId(), tbOrderInfo.getShopId());
                 Map<Integer, Integer> map;
@@ -197,8 +197,8 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
             }
 
             TbOrderDetail seatInfo = null;
-            ArrayList<TbOrderDetail> detailList = new ArrayList<>();
-            for (TbOrderDetail detail : details) {
+            ArrayList<TbFullOrderDetail> detailList = new ArrayList<>();
+            for (TbFullOrderDetail detail : details) {
                 if (TableConstant.CART_SEAT_ID.equals(detail.getProductId().toString())) {
                     seatInfo = detail;
                 }else {
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderInfoVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderInfoVo.java
index 7a8c4949..f8f6a1fc 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderInfoVo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderInfoVo.java
@@ -114,7 +114,7 @@ public class TbOrderInfoVo  {
 
     private String remark;
 
-    private List<TbOrderDetail> detailList;
+    private List<? extends TbOrderDetail> detailList;
 
     private TbOrderDetail seatInfo;
 }