fix:购物车下单

This commit is contained in:
momo 2023-09-20 16:37:37 +08:00
parent 71b6aaf014
commit 4d3f1512ac
2 changed files with 44 additions and 18 deletions

View File

@ -108,19 +108,35 @@ type OrderStatus struct {
// 订单商品 // 订单商品
type OrderProduct struct { type OrderProduct struct {
TotalPrice AmountInfo `json:"amount"` // 商品总价 TotalPrice AmountInfo `json:"amount"` // 商品总价
ExpectedDeliveryTime time.Time `json:"expected_delivery_time"` // 预计到货时间 ExpectedDeliveryTime time.Time `json:"expected_delivery_time"` // 预计到货时间
PurchaseQuantity int64 `json:"purchase_quantity"` // 购买数量 PurchaseQuantity int64 `json:"purchase_quantity"` // 购买数量
ProductID int64 `json:"product_id"` // 商品ID ProductID int64 `json:"product_id"` // 商品ID
ProductName string `json:"product_name"` // 商品名称 ProductName string `json:"product_name"` // 商品名称
ItemPrice AmountInfo `json:"product_price"` // 商品单价 ItemPrice AmountInfo `json:"product_price"` // 商品单价
ProductSnapshot map[string]interface{} `json:"product_snapshot"` // 商品快照 ProductSnapshot map[string]interface{} `json:"product_snapshot"` // 商品快照
ShoppingCartSnapshot *FsShoppingCart `json:"shopping_cart_snapshot"` // 购物车快照 ShoppingCartSnapshot *FsShoppingCart `json:"shopping_cart_snapshot"` // 购物车快照
DiyInformation *UserDiyInformation `json:"diy_information"` ProductCover string `json:"product_cover"` // 商品封面
FittingInfo *FittingInfo `json:"fitting_info"` ProductCoverMetadata map[string]interface{} `json:"product_cover_metadata"` // 商品封面
ProductCover string `json:"product_cover"` // 商品封面 ProductSn string `json:"product_sn"` // 商品编码
ProductCoverMetadata map[string]interface{} `json:"product_cover_metadata"` // 商品封面 DiyInformation *UserDiyInformation `json:"diy_information"`
ProductSn string `json:"product_sn"` // 商品编码 SizeInfo *OrderProductSizeInfo `json:"size_info"`
SizeInfo *SizeInfo `json:"size_info"` FittingInfo *OrderProductFittingInfo `json:"fitting_info"`
StepNum []int `json:"step_num"` // 阶梯数量 StepNum []int `json:"step_num"` // 阶梯数量
}
type OrderProductSizeInfo struct {
SizeID int64 `json:"size_id"`
Capacity string `json:"capacity"`
Title OrderProductSizeInfoTitle `json:"title"`
}
type OrderProductSizeInfoTitle struct {
Inch string `json:"inch"`
Cm string `json:"cm"`
}
type OrderProductFittingInfo struct {
FittingID int64 `json:"fitting_id"` //配件ID
FittingName string `json:"fitting_name"` //配件名称
} }

View File

@ -247,9 +247,19 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe
ShoppingCartSnapshot: &shoppingCart.FsShoppingCart, ShoppingCartSnapshot: &shoppingCart.FsShoppingCart,
ProductSn: *shoppingCart.ShoppingCartProduct.Sn, ProductSn: *shoppingCart.ShoppingCartProduct.Sn,
DiyInformation: &shoppingCartSnapshot.UserDiyInformation, DiyInformation: &shoppingCartSnapshot.UserDiyInformation,
FittingInfo: &shoppingCartSnapshot.FittingInfo, FittingInfo: &gmodel.OrderProductFittingInfo{
SizeInfo: &shoppingCartSnapshot.SizeInfo, FittingID: *shoppingCart.FittingId,
StepNum: stepNum, FittingName: shoppingCartSnapshot.FittingInfo.FittingName,
},
SizeInfo: &gmodel.OrderProductSizeInfo{
SizeID: *shoppingCart.SizeId,
Capacity: shoppingCartSnapshot.SizeInfo.Capacity,
Title: gmodel.OrderProductSizeInfoTitle{
Inch: shoppingCartSnapshot.SizeInfo.Inch,
Cm: shoppingCartSnapshot.SizeInfo.Cm,
},
},
StepNum: stepNum,
}) })
} }