From c9dbfabf40f80f1015d32bde2e49e0eb316d1660 Mon Sep 17 00:00:00 2001
From: luluyuyu <3305167204@qq.com>
Date: Sun, 8 Dec 2024 10:55:09 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E6=8D=A2=E5=9B=9E=E5=95=86=E5=93=81=E4=B8=8E=E9=97=A8?=
 =?UTF-8?q?=E5=BA=97=E7=9A=84=E5=85=B3=E7=B3=BB=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/skyeye/order/entity/OrderComment.java   | 4 ++++
 .../skyeye/order/service/impl/OrderCommentServiceImpl.java    | 1 +
 2 files changed, 5 insertions(+)

diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/entity/OrderComment.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/entity/OrderComment.java
index 7a1bc79f..11ae8fa7 100644
--- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/entity/OrderComment.java
+++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/entity/OrderComment.java
@@ -63,6 +63,10 @@ public class OrderComment extends OperatorUserInfo {
     @Property(value = "门店信息")
     private Map<String, Object> storeMation;
 
+    @TableField(exist = false)
+    @Property(value = "子单信息")
+    private Map<String, Object> orderItemMation;
+
     @TableField(value = "order_id")
     @ApiModelProperty(value = "订单id", required = "required")
     private String orderId;
diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java
index 027c4fc9..85fb5040 100644
--- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java
+++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java
@@ -215,6 +215,7 @@ public class OrderCommentServiceImpl extends SkyeyeBusinessServiceImpl<OrderComm
         iMaterialNormsService.setDataMation(list, OrderComment::getNormsId);
         memberService.setDataMation(list, OrderComment::getCreateId);
         shopStoreService.setDataMation(list, OrderComment::getStoreId);
+        orderItemService.setDataMation(list,OrderComment::getOrderItemId);
         return list;
     }