fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
laodaming 2023-11-02 15:00:48 +08:00
commit 8d49d4f164
1 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
service/repositories/order.go
View File

@ -1769,42 +1769,45 @@ func (d *defaultOrder) OrderDetailHandler(ctx context.Context, orderInfo *gmodel
StatusLink: order.GetOrderStatusLinkUser(*orderInfo.DeliveryMethod, statusLink), StatusLink: order.GetOrderStatusLinkUser(*orderInfo.DeliveryMethod, statusLink),
Metadata: orderMetadata, Metadata: orderMetadata,
} }
// 购物车对应商品
var shoppingCartSnapshotDataMap = make(map[int64]gmodel.FsShoppingCartData, len(shoppingCartSnapshot))
for _, shoppingCartSnapshotValue := range shoppingCartSnapshot {
var shoppingCartSnapshotData gmodel.FsShoppingCartData
snapshot, err := d.OrderShoppingCartSnapshotHandler(ctx, shoppingCartSnapshotValue.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
}
var orderProductList []gmodel.OrderProduct var orderProductList []gmodel.OrderProduct
for _, productValue := range orderProduct { for _, productValue := range orderProduct {
var selectColorIndex int64 var selectColorIndex int64
var shoppingCartSnapshotData gmodel.FsShoppingCartData var shoppingCartSnapshotData = shoppingCartSnapshotDataMap[productValue.CartId]
for _, shoppingCartSnapshotValue := range shoppingCartSnapshot { var snapshotInfo = shoppingCartSnapshotData.Snapshot
if productValue.CartId == shoppingCartSnapshotValue.Id { if snapshotInfo != nil {
var snapshotInfoMap = *snapshotInfo
snapshot, err := d.OrderShoppingCartSnapshotHandler(ctx, shoppingCartSnapshotValue.Snapshot) selectColorIndexV, selectColorIndexE := snapshotInfoMap["select_color_index"]
if err != nil { if selectColorIndexE {
logc.Errorf(ctx, "OrderDetailHandler OrderShoppingCartSnapshotHandler failed, err: %v", err) selectColorIndex = selectColorIndexV.(int64)
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
selectColorIndexV, selectColorIndexE := snapshot["select_color_index"]
if selectColorIndexE {
selectColorIndex = selectColorIndexV.(int64)
}
} }
} }
var expectedDeliveryTime time.Time var expectedDeliveryTime time.Time
if productValue.ExpectedDeliveryTime == nil { if productValue.ExpectedDeliveryTime == nil {
expectedDeliveryTime = expectedTime expectedDeliveryTime = expectedTime