From ba40f63b42732983defb15d3d8acfa8cee767ba7 Mon Sep 17 00:00:00 2001
From: momo <1012651275@qq.com>
Date: Tue, 10 Oct 2023 17:25:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=AE=97=E6=B3=95=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 model/gmodel/fs_order_logic.go | 8 ++++----
 service/repositories/order.go  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/model/gmodel/fs_order_logic.go b/model/gmodel/fs_order_logic.go
index cd798aac..1a5cb01e 100644
--- a/model/gmodel/fs_order_logic.go
+++ b/model/gmodel/fs_order_logic.go
@@ -156,10 +156,10 @@ type OrderProductInter struct {
 	FittingInfo          *OrderProductFittingInfo `json:"fitting_info"`
 	IsHighlyCustomized   int64                    `json:"is_highly_customized"`
 	RenderImage          string                   `json:"render_image"`
-	ExpectedDeliveryTime ExpectedDelivery         `json:"expected_delivery_time"` // 预计到货时间
-	ActualDeliveryTime   ExpectedDelivery         `json:"actual_delivery_time"`   // 实际到货时间
+	ExpectedDeliveryTime *ExpectedDelivery        `json:"expected_delivery_time"` // 预计到货时间
+	ActualDeliveryTime   *ExpectedDelivery        `json:"actual_delivery_time"`   // 实际到货时间
 }
 type OrderMetadata struct {
-	ExpectedDeliveryTime ExpectedDelivery `json:"expected_delivery_time"` // 预计到货时间
-	ActualDeliveryTime   ExpectedDelivery `json:"actual_delivery_time"`   // 实际到货时间
+	ExpectedDeliveryTime *ExpectedDelivery `json:"expected_delivery_time"` // 预计到货时间
+	ActualDeliveryTime   *ExpectedDelivery `json:"actual_delivery_time"`   // 实际到货时间
 }
diff --git a/service/repositories/order.go b/service/repositories/order.go
index 5887ef2f..8daaddd3 100644
--- a/service/repositories/order.go
+++ b/service/repositories/order.go
@@ -1197,8 +1197,8 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe
 				IsHighlyCustomized:   *shoppingCart.IsHighlyCustomized,
 				RenderImage:          shoppingCartSnapshot.RenderImage,
 				CartId:               shoppingCart.Id,
-				ExpectedDeliveryTime: expectedDeliveryTime,
-				ActualDeliveryTime:   actualDeliveryTime,
+				ExpectedDeliveryTime: &expectedDeliveryTime,
+				ActualDeliveryTime:   &actualDeliveryTime,
 			}
 			orderProductList = append(orderProductList, &productInter)
 			shoppingProductSnapshotList = append(shoppingProductSnapshotList, shoppingCart.ShoppingCartProduct)
@@ -1278,8 +1278,8 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe
 		byteShoppingProductSnapshot, _ := json.Marshal(shoppingProductSnapshotList)
 		byteStatusLink, _ := json.Marshal(statusLink)
 		byteOrderMetadata, _ := json.Marshal(gmodel.OrderMetadata{
-			ExpectedDeliveryTime: expectedDeliveryTime,
-			ActualDeliveryTime:   actualDeliveryTime,
+			ExpectedDeliveryTime: &expectedDeliveryTime,
+			ActualDeliveryTime:   &actualDeliveryTime,
 		})
 
 		// 创建订单