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

fix:订单优化

Browse Source
This commit is contained in:
momo 2023-11-02 15:16:44 +08:00
parent c8e63f4a57
commit 2d0ea47c7c
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
service/repositories/order.go
View File

@ -1672,13 +1672,6 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe
}, nil }, 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) { 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)) var shoppingCartSnapshotDataMap = make(map[int64]gmodel.FsShoppingCartData, len(shoppingCartSnapshot))
for _, shoppingCartSnapshotValue := range shoppingCartSnapshot { for _, shoppingCartSnapshotValue := range shoppingCartSnapshot {
var shoppingCartSnapshotData gmodel.FsShoppingCartData var snapshot map[string]interface{}
snapshot, err := d.OrderShoppingCartSnapshotHandler(ctx, shoppingCartSnapshotValue.Snapshot) err = json.Unmarshal([]byte(*shoppingCartSnapshotValue.Snapshot), &snapshot)
if err != nil { if err != nil {
logc.Errorf(ctx, "OrderDetailHandler OrderShoppingCartSnapshotHandler failed, err: %v", err) logc.Errorf(ctx, "OrderDetailHandler OrderShoppingCartSnapshotHandler failed, err: %v", err)
return nil, err return nil, err
} }
shoppingCartSnapshotData.Id = shoppingCartSnapshotValue.Id shoppingCartSnapshotDataMap[shoppingCartSnapshotValue.Id] = gmodel.FsShoppingCartData{
shoppingCartSnapshotData.UserId = shoppingCartSnapshotValue.UserId Id: shoppingCartSnapshotValue.Id,
shoppingCartSnapshotData.ProductId = shoppingCartSnapshotValue.ProductId UserId: shoppingCartSnapshotValue.UserId,
shoppingCartSnapshotData.TemplateId = shoppingCartSnapshotValue.TemplateId ProductId: shoppingCartSnapshotValue.ProductId,
shoppingCartSnapshotData.ModelId = shoppingCartSnapshotValue.ModelId TemplateId: shoppingCartSnapshotValue.TemplateId,
shoppingCartSnapshotData.SizeId = shoppingCartSnapshotValue.SizeId ModelId: shoppingCartSnapshotValue.ModelId,
shoppingCartSnapshotData.LightId = shoppingCartSnapshotValue.LightId SizeId: shoppingCartSnapshotValue.SizeId,
shoppingCartSnapshotData.FittingId = shoppingCartSnapshotValue.FittingId LightId: shoppingCartSnapshotValue.LightId,
shoppingCartSnapshotData.PurchaseQuantity = shoppingCartSnapshotValue.PurchaseQuantity FittingId: shoppingCartSnapshotValue.FittingId,
shoppingCartSnapshotData.IsSelected = shoppingCartSnapshotValue.IsSelected PurchaseQuantity: shoppingCartSnapshotValue.PurchaseQuantity,
shoppingCartSnapshotData.IsSelected = shoppingCartSnapshotValue.IsSelected IsSelected: shoppingCartSnapshotValue.IsSelected,
shoppingCartSnapshotData.IsHighlyCustomized = shoppingCartSnapshotValue.IsHighlyCustomized IsHighlyCustomized: shoppingCartSnapshotValue.IsHighlyCustomized,
shoppingCartSnapshotData.Ctime = shoppingCartSnapshotValue.Ctime Ctime: shoppingCartSnapshotValue.Ctime,
shoppingCartSnapshotData.Utime = shoppingCartSnapshotValue.Utime Utime: shoppingCartSnapshotValue.Utime,
shoppingCartSnapshotData.Snapshot = &snapshot 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 = shoppingCartSnapshotDataMap[productValue.CartId] var shoppingCartSnapshotData = shoppingCartSnapshotDataMap[productValue.CartId]
var snapshotInfo = shoppingCartSnapshotData.Snapshot if shoppingCartSnapshotData.Snapshot != nil {
if snapshotInfo != nil { var snapshotInfoMap = *shoppingCartSnapshotData.Snapshot
var snapshotInfoMap = *snapshotInfo
selectColorIndexV, selectColorIndexE := snapshotInfoMap["select_color_index"] selectColorIndexV, selectColorIndexE := snapshotInfoMap["select_color_index"]
if selectColorIndexE { if selectColorIndexE {
selectColorIndex = selectColorIndexV.(int64) selectColorIndex = selectColorIndexV.(int64)