From 3e822ba3a0f1e65d71fa8c2a83fd720b55db14d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=91=98=E5=B0=8F=E5=A2=A8?=
 <2291200076@qq.com>
Date: Mon, 17 Apr 2023 22:57:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=20=E5=92=8C=20=E5=8F=91=E8=B4=A7=E5=A4=87=E6=B3=A8=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/cxyxiaomo/epp/common/pojo/Order.java      | 2 ++
 .../src/main/java/com/cxyxiaomo/epp/common/vo/OrderVO.java      | 2 ++
 .../src/main/resources/mybatis/mapper/OrderMapper.xml           | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/backend/microservice-common/src/main/java/com/cxyxiaomo/epp/common/pojo/Order.java b/backend/microservice-common/src/main/java/com/cxyxiaomo/epp/common/pojo/Order.java
index 96ba810..3d78e52 100644
--- a/backend/microservice-common/src/main/java/com/cxyxiaomo/epp/common/pojo/Order.java
+++ b/backend/microservice-common/src/main/java/com/cxyxiaomo/epp/common/pojo/Order.java
@@ -20,4 +20,6 @@ public class Order {
     private LocalDateTime cancelDate;
     private LocalDateTime shipDate;
     private LocalDateTime deliverDate;
+    private String expressId;
+    private String comment;
 }
diff --git a/backend/microservice-common/src/main/java/com/cxyxiaomo/epp/common/vo/OrderVO.java b/backend/microservice-common/src/main/java/com/cxyxiaomo/epp/common/vo/OrderVO.java
index 12c2cdb..8610f87 100644
--- a/backend/microservice-common/src/main/java/com/cxyxiaomo/epp/common/vo/OrderVO.java
+++ b/backend/microservice-common/src/main/java/com/cxyxiaomo/epp/common/vo/OrderVO.java
@@ -30,6 +30,8 @@ public class OrderVO implements Serializable {
     private String cancelDate;
     private String shipDate;
     private String deliverDate;
+    private String expressId;
+    private String comment;
 
     public static OrderVO convertFrom(Order order) {
         if (order == null) {
diff --git a/backend/microservice-provider-shop-8003/src/main/resources/mybatis/mapper/OrderMapper.xml b/backend/microservice-provider-shop-8003/src/main/resources/mybatis/mapper/OrderMapper.xml
index 17c2553..902e6ba 100644
--- a/backend/microservice-provider-shop-8003/src/main/resources/mybatis/mapper/OrderMapper.xml
+++ b/backend/microservice-provider-shop-8003/src/main/resources/mybatis/mapper/OrderMapper.xml
@@ -14,6 +14,8 @@
         <result column="cancel_date" property="cancelDate"/>
         <result column="ship_date" property="shipDate"/>
         <result column="deliver_date" property="deliverDate"/>
+        <result column="express_id" property="expressId"/>
+        <result column="comment" property="comment"/>
     </resultMap>
     <resultMap id="OrderDetailResultMap" type="com.cxyxiaomo.epp.common.pojo.OrderDetail">
         <id property="id" column="id"/>