From 428791a1b68b709ef37decfe4c1dae6d77b271ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 25 Nov 2024 09:51:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=9A=E6=9D=A1=E9=80=80=E6=AC=BEdeta?=
 =?UTF-8?q?il=E5=90=88=E5=B9=B6=E4=B8=BA=E5=8D=95=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chaozhanggui/system/cashierservice/entity/vo/OrderVo.java  | 3 ++-
 .../system/cashierservice/service/OrderService.java            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 a5abc9e..2e44b22 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
@@ -4,6 +4,7 @@ import com.chaozhanggui.system.cashierservice.entity.TbOrderDetail;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -18,7 +19,7 @@ public class OrderVo {
     private String tableName;
     private String shopQrcode;
 
-    private List<TbOrderDetail> details;
+    private Collection<TbOrderDetail> details;
 
     private String cartListString;
     private String orderNo;
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 579adaa..d28137d 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -308,7 +308,7 @@ public class OrderService {
         orderVo.setStatus(orderInfo.getStatus());
         //TODO 增加商家二维码
         orderVo.setShopQrcode(shopInfo.getShopQrcode());
-        orderVo.setDetails((List<TbOrderDetail>) detailHashMap.values());
+        orderVo.setDetails(detailHashMap.values());
         orderVo.setOrderNo(orderInfo.getOrderNo());
         orderVo.setTime(orderInfo.getCreatedAt());
         if (orderInfo.getStatus().equals("paying") || orderInfo.getStatus().equals("unpaid")) {