From 2d0ea47c7caf94e451184a23c2d6c74c9b9bdadb Mon Sep 17 00:00:00 2001
From: momo <1012651275@qq.com>
Date: Thu, 2 Nov 2023 15:16:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/repositories/order.go | 48 +++++++++++++++--------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/service/repositories/order.go b/service/repositories/order.go
index 9d16f295..b030fdf4 100644
--- a/service/repositories/order.go
+++ b/service/repositories/order.go
@@ -1672,13 +1672,6 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe
 	}, nil
 }
 
-// 购物车快照处理
-func (d *defaultOrder) OrderShoppingCartSnapshotHandler(ctx context.Context, req *string) (res map[string]interface{}, err error) {
-	var snapshot map[string]interface{}
-	json.Unmarshal([]byte(*req), &snapshot)
-	return snapshot, nil
-}
-
 // 详情处理
 func (d *defaultOrder) OrderDetailHandler(ctx context.Context, orderInfo *gmodel.FsOrder, original int64) (res *DetailRes, err error) {
 
@@ -1772,36 +1765,35 @@ func (d *defaultOrder) OrderDetailHandler(ctx context.Context, orderInfo *gmodel
 		// 购物车对应商品
 		var shoppingCartSnapshotDataMap = make(map[int64]gmodel.FsShoppingCartData, len(shoppingCartSnapshot))
 		for _, shoppingCartSnapshotValue := range shoppingCartSnapshot {
-			var shoppingCartSnapshotData gmodel.FsShoppingCartData
-			snapshot, err := d.OrderShoppingCartSnapshotHandler(ctx, shoppingCartSnapshotValue.Snapshot)
+			var snapshot map[string]interface{}
+			err = json.Unmarshal([]byte(*shoppingCartSnapshotValue.Snapshot), &snapshot)
 			if err != nil {
 				logc.Errorf(ctx, "OrderDetailHandler OrderShoppingCartSnapshotHandler failed, err: %v", err)
 				return nil, err
 			}
-			shoppingCartSnapshotData.Id = shoppingCartSnapshotValue.Id
-			shoppingCartSnapshotData.UserId = shoppingCartSnapshotValue.UserId
-			shoppingCartSnapshotData.ProductId = shoppingCartSnapshotValue.ProductId
-			shoppingCartSnapshotData.TemplateId = shoppingCartSnapshotValue.TemplateId
-			shoppingCartSnapshotData.ModelId = shoppingCartSnapshotValue.ModelId
-			shoppingCartSnapshotData.SizeId = shoppingCartSnapshotValue.SizeId
-			shoppingCartSnapshotData.LightId = shoppingCartSnapshotValue.LightId
-			shoppingCartSnapshotData.FittingId = shoppingCartSnapshotValue.FittingId
-			shoppingCartSnapshotData.PurchaseQuantity = shoppingCartSnapshotValue.PurchaseQuantity
-			shoppingCartSnapshotData.IsSelected = shoppingCartSnapshotValue.IsSelected
-			shoppingCartSnapshotData.IsSelected = shoppingCartSnapshotValue.IsSelected
-			shoppingCartSnapshotData.IsHighlyCustomized = shoppingCartSnapshotValue.IsHighlyCustomized
-			shoppingCartSnapshotData.Ctime = shoppingCartSnapshotValue.Ctime
-			shoppingCartSnapshotData.Utime = shoppingCartSnapshotValue.Utime
-			shoppingCartSnapshotData.Snapshot = &snapshot
-			shoppingCartSnapshotDataMap[shoppingCartSnapshotValue.Id] = shoppingCartSnapshotData
+			shoppingCartSnapshotDataMap[shoppingCartSnapshotValue.Id] = gmodel.FsShoppingCartData{
+				Id:                 shoppingCartSnapshotValue.Id,
+				UserId:             shoppingCartSnapshotValue.UserId,
+				ProductId:          shoppingCartSnapshotValue.ProductId,
+				TemplateId:         shoppingCartSnapshotValue.TemplateId,
+				ModelId:            shoppingCartSnapshotValue.ModelId,
+				SizeId:             shoppingCartSnapshotValue.SizeId,
+				LightId:            shoppingCartSnapshotValue.LightId,
+				FittingId:          shoppingCartSnapshotValue.FittingId,
+				PurchaseQuantity:   shoppingCartSnapshotValue.PurchaseQuantity,
+				IsSelected:         shoppingCartSnapshotValue.IsSelected,
+				IsHighlyCustomized: shoppingCartSnapshotValue.IsHighlyCustomized,
+				Ctime:              shoppingCartSnapshotValue.Ctime,
+				Utime:              shoppingCartSnapshotValue.Utime,
+				Snapshot:           &snapshot,
+			}
 		}
 		var orderProductList []gmodel.OrderProduct
 		for _, productValue := range orderProduct {
 			var selectColorIndex int64
 			var shoppingCartSnapshotData = shoppingCartSnapshotDataMap[productValue.CartId]
-			var snapshotInfo = shoppingCartSnapshotData.Snapshot
-			if snapshotInfo != nil {
-				var snapshotInfoMap = *snapshotInfo
+			if shoppingCartSnapshotData.Snapshot != nil {
+				var snapshotInfoMap = *shoppingCartSnapshotData.Snapshot
 				selectColorIndexV, selectColorIndexE := snapshotInfoMap["select_color_index"]
 				if selectColorIndexE {
 					selectColorIndex = selectColorIndexV.(int64)

From cf2a352f1ee852f809edba63b33d6567938bef38 Mon Sep 17 00:00:00 2001
From: momo <1012651275@qq.com>
Date: Thu, 2 Nov 2023 15:20:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/repositories/order.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/repositories/order.go b/service/repositories/order.go
index b030fdf4..ed8a7522 100644
--- a/service/repositories/order.go
+++ b/service/repositories/order.go
@@ -1047,7 +1047,7 @@ func (d *defaultOrder) CreatePrePaymentByBalance(ctx context.Context, in *Create
 	payConfig := &pay.Config{}
 	payConfig.Stripe.PayType = "intent"
 	payConfig.Stripe.Key = in.StripeKey
-	var metadata = make(map[string]string, 2)
+	var metadata = make(map[string]string, 4)
 	metadata["model"] = "product_order"
 	metadata["order_sn"] = in.OrderSn
 	metadata["pay_stage"] = "remaining_balance"
@@ -1216,7 +1216,7 @@ func (d *defaultOrder) CreatePrePaymentByDeposit(ctx context.Context, in *Create
 	payConfig := &pay.Config{}
 	payConfig.Stripe.PayType = "intent"
 	payConfig.Stripe.Key = in.StripeKey
-	var metadata = make(map[string]string, 2)
+	var metadata = make(map[string]string, 4)
 	metadata["model"] = "product_order"
 	metadata["order_sn"] = in.OrderSn
 	metadata["pay_stage"] = "deposit"