From 51cfb9eb007a68f2941280c1d712997582f1ac49 Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Sat, 9 Nov 2024 11:32:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=86=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E7=AB=AF=E7=94=A8=E6=88=B7=E5=88=9B=E5=BB=BA=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cultural/heritage/model/dto/order/OrderAddRequest.java | 4 ++++
 .../model/dto/order/capital/OrderMainInfoAddRequest.java   | 4 ++++
 .../java/com/cultural/heritage/model/entity/Order.java     | 7 +++++++
 src/main/java/com/cultural/heritage/model/vo/GoodVO.java   | 5 +----
 src/main/java/com/cultural/heritage/model/vo/OrderVO.java  | 5 +++++
 .../heritage/service/order/impl/OrderServiceImpl.java      | 2 ++
 6 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/cultural/heritage/model/dto/order/OrderAddRequest.java b/src/main/java/com/cultural/heritage/model/dto/order/OrderAddRequest.java
index 0b1b556..615c6d7 100644
--- a/src/main/java/com/cultural/heritage/model/dto/order/OrderAddRequest.java
+++ b/src/main/java/com/cultural/heritage/model/dto/order/OrderAddRequest.java
@@ -69,6 +69,10 @@ public class OrderAddRequest implements Serializable {
     @Schema(description = "订单状态", example = "待发货")
     private String orderStatus;
 
+    /**
+     * 订单备注
+     */
+    private String note;
 
     /**
      * 订单明细信息
diff --git a/src/main/java/com/cultural/heritage/model/dto/order/capital/OrderMainInfoAddRequest.java b/src/main/java/com/cultural/heritage/model/dto/order/capital/OrderMainInfoAddRequest.java
index 32e6b09..a1fb60f 100644
--- a/src/main/java/com/cultural/heritage/model/dto/order/capital/OrderMainInfoAddRequest.java
+++ b/src/main/java/com/cultural/heritage/model/dto/order/capital/OrderMainInfoAddRequest.java
@@ -56,6 +56,10 @@ public class OrderMainInfoAddRequest implements Serializable {
      */
     private String orderStatus;
 
+    /**
+     * 订单备注
+     */
+    private String note;
 
     /**
      * 订单主要明细信息
diff --git a/src/main/java/com/cultural/heritage/model/entity/Order.java b/src/main/java/com/cultural/heritage/model/entity/Order.java
index 43549ef..6c5851c 100644
--- a/src/main/java/com/cultural/heritage/model/entity/Order.java
+++ b/src/main/java/com/cultural/heritage/model/entity/Order.java
@@ -77,12 +77,19 @@ public class Order implements Serializable {
      */
     private Double totalAmount;
 
+
     /**
      * 订单状态
      */
     private String orderStatus;
 
 
+    /**
+     * 订单备注
+     */
+    private String note;
+
+
     /**
      * 创建时间
      */
diff --git a/src/main/java/com/cultural/heritage/model/vo/GoodVO.java b/src/main/java/com/cultural/heritage/model/vo/GoodVO.java
index 6c0d618..8dc8716 100644
--- a/src/main/java/com/cultural/heritage/model/vo/GoodVO.java
+++ b/src/main/java/com/cultural/heritage/model/vo/GoodVO.java
@@ -39,10 +39,7 @@ public class GoodVO implements Serializable {
      */
     private String label;
 
-    /**
-     * 预约日期
-     */
-    private String reserveDate;
+
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/cultural/heritage/model/vo/OrderVO.java b/src/main/java/com/cultural/heritage/model/vo/OrderVO.java
index 5a682db..4f67f4b 100644
--- a/src/main/java/com/cultural/heritage/model/vo/OrderVO.java
+++ b/src/main/java/com/cultural/heritage/model/vo/OrderVO.java
@@ -67,6 +67,11 @@ public class OrderVO implements Serializable {
      */
     private String orderStatus;
 
+    /**
+     * 订单备注
+     */
+    private String note;
+
 
     /**
      * 订单明细信息
diff --git a/src/main/java/com/cultural/heritage/service/order/impl/OrderServiceImpl.java b/src/main/java/com/cultural/heritage/service/order/impl/OrderServiceImpl.java
index 2c52694..cc0a643 100644
--- a/src/main/java/com/cultural/heritage/service/order/impl/OrderServiceImpl.java
+++ b/src/main/java/com/cultural/heritage/service/order/impl/OrderServiceImpl.java
@@ -94,6 +94,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         Long couponId = orderMainInfoAddRequest.getCouponId();
         String orderNumber = orderMainInfoAddRequest.getOrderNumber();
         String orderStatus = orderMainInfoAddRequest.getOrderStatus();
+        String note = orderMainInfoAddRequest.getNote();
         Double totalAmount = orderMainInfoAddRequest.getTotalAmount();
         List<OrderItemMainInfoAddRequest> orderItemMainInfoAddRequestList = orderMainInfoAddRequest.getOrderItemMainInfoAddRequestList();
 
@@ -127,6 +128,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         orderAddRequest.setUserName(userName);
         orderAddRequest.setOrderNumber(orderNumber);
         orderAddRequest.setOrderStatus(orderStatus);
+        orderAddRequest.setNote(note);
         orderAddRequest.setTotalAmount(totalAmount);
         orderAddRequest.setAddressSnapshot(addressSnapshot);
         orderAddRequest.setContactsSnapshot(contactsSnapshot);