diff --git a/model/gmodel/fs_order_gen.go b/model/gmodel/fs_order_gen.go index a8448ebf..aa54f279 100644 --- a/model/gmodel/fs_order_gen.go +++ b/model/gmodel/fs_order_gen.go @@ -1,8 +1,9 @@ package gmodel import ( - "gorm.io/gorm" "time" + + "gorm.io/gorm" ) // fs_order 订单表 diff --git a/model/gmodel/fs_product_model3d_logic.go b/model/gmodel/fs_product_model3d_logic.go index 5ff31216..74ffe4e6 100755 --- a/model/gmodel/fs_product_model3d_logic.go +++ b/model/gmodel/fs_product_model3d_logic.go @@ -37,11 +37,15 @@ func (d *FsProductModel3dModel) GetAllByIdsWithoutStatus(ctx context.Context, id err = db.Find(&resp).Error return resp, err } -func (d *FsProductModel3dModel) GetAllByIdsTag(ctx context.Context, ids []int64, tag int64) (resp []FsProductModel3d, err error) { +func (d *FsProductModel3dModel) GetAllByIdsTag(ctx context.Context, ids []int64, tag int64, fields ...string) (resp []FsProductModel3d, err error) { if len(ids) == 0 { return } - err = d.db.WithContext(ctx).Model(&FsProductModel3d{}).Where("`id` in (?) and `status` = ? and `tag` = ?", ids, 1, tag).Find(&resp).Error + db := d.db.WithContext(ctx).Model(&FsProductModel3d{}).Where("`id` in (?) and `status` = ? and `tag` = ?", ids, 1, tag) + if len(fields) > 0 { + db = db.Select(fields[0]) + } + err = db.Find(&resp).Error return resp, err } diff --git a/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go b/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go index 4a24ce61..c0384d90 100644 --- a/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go +++ b/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go @@ -54,6 +54,7 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu logx.Error(err) return } + var colors interface{} if logoInfo.Metadata == nil || *logoInfo.Metadata == "" { // 返回固定模板A1a productTemplateTags, err = l.svcCtx.AllModels.FsProductTemplateTags.GetListByTagNames(l.ctx, []string{"A1"}, req.Limit, 1, "`id` DESC") @@ -68,6 +69,7 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu logx.Error(err) return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse user metadata") } + colors = metaData["colors"] var templateTagNameList []string b, _ := json.Marshal(metaData["template_tagid"]) if err = json.Unmarshal(b, &templateTagNameList); err != nil { @@ -106,6 +108,7 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu TemplateTag: *v.TemplateTag, Cover: *v.Cover, CoverMetadata: mapResourceMetadata[*v.Cover], + Colors: colors, }) } return resp.SetStatusWithMessage(basic.CodeOK, "success", list) diff --git a/server/product-template-tag/internal/types/types.go b/server/product-template-tag/internal/types/types.go index 6c7f6950..e81cb040 100644 --- a/server/product-template-tag/internal/types/types.go +++ b/server/product-template-tag/internal/types/types.go @@ -14,6 +14,7 @@ type GetProductTemplateTagsRsp struct { TemplateTag string `json:"template_tag"` Cover string `json:"cover"` CoverMetadata interface{} `json:"cover_metadata"` + Colors interface{} `json:"colors"` } type Request struct { @@ -39,10 +40,10 @@ type File struct { } type Meta struct { - TotalCount int64 `json:"totalCount"` - PageCount int64 `json:"pageCount"` - CurrentPage int `json:"currentPage"` - PerPage int `json:"perPage"` + TotalCount int64 `json:"total_count"` + PageCount int64 `json:"page_count"` + CurrentPage int `json:"current_page"` + PerPage int `json:"per_page"` } // Set 设置Response的Code和Message值 diff --git a/server/shopping-cart/internal/logic/calculatecartpricelogic.go b/server/shopping-cart/internal/logic/calculatecartpricelogic.go index 0c35521d..ce0bfc13 100644 --- a/server/shopping-cart/internal/logic/calculatecartpricelogic.go +++ b/server/shopping-cart/internal/logic/calculatecartpricelogic.go @@ -3,9 +3,14 @@ package logic import ( "context" "fmt" + "fusenapi/constants" "fusenapi/model/gmodel" "fusenapi/utils/auth" "fusenapi/utils/basic" + "fusenapi/utils/format" + "fusenapi/utils/step_price" + "math" + "strings" "fusenapi/server/shopping-cart/internal/svc" "fusenapi/server/shopping-cart/internal/types" @@ -39,13 +44,18 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri return resp.SetStatusWithMessage(basic.CodeOK, "success", types.CalculateCartPriceRsp{CalculateResultList: []types.CalculateResultItem{}}) } cartIds := make([]int64, 0, len(req.CalculateList)) + mapCalculateQuantity := make(map[int64]int64) for _, v := range req.CalculateList { cartIds = append(cartIds, v.CartId) + if v.PurchaseQuantity <= 0 { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "purchase quantity must grater than 0") + } + mapCalculateQuantity[v.CartId] = v.PurchaseQuantity } //获取购物车列表 carts, _, err := l.svcCtx.AllModels.FsShoppingCart.GetAllCartsByParam(l.ctx, gmodel.GetAllCartsByParamReq{ Ids: cartIds, - Fields: "id,size_id,product_id", + Fields: "id,size_id,product_id,fitting_id", UserId: userinfo.UserId, Page: 1, Limit: len(cartIds), @@ -54,6 +64,9 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri logx.Error(err) return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get cart list") } + if len(carts) < len(req.CalculateList) { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "please refresh page for the shopping cart has changed!!") + } sizeIds := make([]int64, 0, len(carts)) productIds := make([]int64, 0, len(carts)) fittingIds := make([]int64, 0, len(carts)) @@ -70,14 +83,70 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri logx.Error(err) return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get price list") } - mapPrice := make(map[string]int) - for k, v := range priceList { - mapPrice[fmt.Sprintf("%d_%d", *v.ProductId, *v.SizeId)] = k + mapPrice := make(map[string]gmodel.FsProductPrice) + for _, v := range priceList { + mapPrice[fmt.Sprintf("%d_%d", *v.ProductId, *v.SizeId)] = v } - //获取配件列表 - // todo 下周写 - /*fittingList, err := l.svcCtx.AllModels.FsProductModel3d.GetAllByIdsTag()*/ - return resp.SetStatus(basic.CodeOK) + //获取配件列表(只有id跟价格) + fittingList, err := l.svcCtx.AllModels.FsProductModel3d.GetAllByIdsTag(l.ctx, fittingIds, constants.TAG_PARTS, "id,price") + if err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get fitting list") + } + mapFitting := make(map[int64]int64) + for _, v := range fittingList { + mapFitting[v.Id] = *v.Price + } + //开始计算价格 + calculateResultList := make([]types.CalculateResultItem, 0, len(req.CalculateList)) + subTotalPrice := int64(0) + for _, cart := range carts { + sizePrice, ok := mapPrice[fmt.Sprintf("%d_%d", *cart.ProductId, *cart.SizeId)] + if !ok { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, fmt.Sprintf("there carts contain some one which have no price info:%d_%d", *cart.ProductId, *cart.SizeId)) + } + //阶梯数量切片 + stepNum, err := format.StrSlicToIntSlice(strings.Split(*sizePrice.StepNum, ",")) + if err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("failed to parse step number:%d_%d", *cart.ProductId, *cart.SizeId)) + } + lenStepNum := len(stepNum) + //阶梯价格切片 + stepPrice, err := format.StrSlicToIntSlice(strings.Split(*sizePrice.StepPrice, ",")) + if err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("failed to parse step price:%d_%d", *cart.ProductId, *cart.SizeId)) + } + lenStepPrice := len(stepPrice) + if lenStepPrice == 0 || lenStepNum == 0 { + return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("step price or step number is not set:%d_%d", *cart.ProductId, *cart.SizeId)) + } + //购买箱数 + boxQuantity := int(math.Ceil(float64(mapCalculateQuantity[cart.Id]) / float64(*sizePrice.EachBoxNum))) + //根据数量获取阶梯价格中对应的价格 + itemPrice := step_price.GetCentStepPrice(boxQuantity, stepNum, stepPrice) + //如果有配件，单价也要加入配件价格 + if *cart.FittingId > 0 { + if fittingPrice, ok := mapFitting[*cart.FittingId]; ok { + itemPrice += fittingPrice + } else { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "cart contain some one witch lose fitting:%d", *cart.FittingId) + } + } + //单个购物车总价 + totalPrice := itemPrice * mapCalculateQuantity[cart.Id] + calculateResultList = append(calculateResultList, types.CalculateResultItem{ + CartId: cart.Id, + ItemPrice: fmt.Sprintf("%.3f", format.CentitoDollar(itemPrice)), + TotalPrice: fmt.Sprintf("%.3f", format.CentitoDollar(totalPrice)), + }) + subTotalPrice += totalPrice + } + return resp.SetStatusWithMessage(basic.CodeOK, "success", types.CalculateCartPriceRsp{ + SubTotalPrice: fmt.Sprintf("%.3f", format.CentitoDollar(subTotalPrice)), + CalculateResultList: calculateResultList, + }) } // 处理逻辑后 w,r 如:重定向, resp 必须重新处理 diff --git a/server/shopping-cart/internal/logic/getcartslogic.go b/server/shopping-cart/internal/logic/getcartslogic.go index 0a52ba1e..303716f4 100644 --- a/server/shopping-cart/internal/logic/getcartslogic.go +++ b/server/shopping-cart/internal/logic/getcartslogic.go @@ -2,6 +2,7 @@ package logic import ( "context" + "encoding/json" "errors" "fmt" "fusenapi/constants" @@ -9,6 +10,7 @@ import ( "fusenapi/utils/auth" "fusenapi/utils/basic" "fusenapi/utils/format" + "fusenapi/utils/s3url_to_s3id" "fusenapi/utils/shopping_cart" "fusenapi/utils/step_price" "math" @@ -66,20 +68,22 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo }) } var ( - mapSize = make(map[int64]gmodel.FsProductSize) - mapModel = make(map[int64]gmodel.FsProductModel3d) - mapTemplate = make(map[int64]gmodel.FsProductTemplateV2) - mapSizePrice = make(map[string]gmodel.FsProductPrice) - mapProduct = make(map[int64]struct{}) + mapSize = make(map[int64]gmodel.FsProductSize) + mapModel = make(map[int64]gmodel.FsProductModel3d) + mapTemplate = make(map[int64]gmodel.FsProductTemplateV2) + mapSizePrice = make(map[string]gmodel.FsProductPrice) + mapProduct = make(map[int64]gmodel.FsProduct) + mapResourceMetadata = make(map[string]interface{}) ) //获取相关信息 err = l.GetRelationInfo(GetRelationInfoReq{ - Carts: carts, - MapSize: mapSize, - MapModel: mapModel, - MapTemplate: mapTemplate, - MapSizePrice: mapSizePrice, - MapProduct: mapProduct, + Carts: carts, + MapSize: mapSize, + MapModel: mapModel, + MapTemplate: mapTemplate, + MapSizePrice: mapSizePrice, + MapProduct: mapProduct, + MapResourceMetadata: mapResourceMetadata, }) if err != nil { return resp.SetStatusWithMessage(basic.CodeServiceErr, err.Error()) @@ -107,24 +111,24 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo snapShot := mapSnapshot[cart.Id] sizePrice, ok := mapSizePrice[fmt.Sprintf("%d_%d", *cart.ProductId, *cart.SizeId)] if !ok { - return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("the size`s price info is not exists:%d", *cart.SizeId)) + return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("the size`s price info is not exists:%d_%d", *cart.ProductId, *cart.SizeId)) } //阶梯数量切片 stepNum, err := format.StrSlicToIntSlice(strings.Split(*sizePrice.StepNum, ",")) if err != nil { logx.Error(err) - return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("failed to parse step number:%d", *cart.SizeId)) + return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("failed to parse step number:%d_%d", *cart.ProductId, *cart.SizeId)) } lenStepNum := len(stepNum) //阶梯价格切片 stepPrice, err := format.StrSlicToIntSlice(strings.Split(*sizePrice.StepPrice, ",")) if err != nil { logx.Error(err) - return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("failed to parse step price:%d", *cart.SizeId)) + return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("failed to parse step price:%d_%d", *cart.ProductId, *cart.SizeId)) } lenStepPrice := len(stepPrice) if lenStepPrice == 0 || lenStepNum == 0 { - return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("step price or step number is not set:%d ", *cart.SizeId)) + return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("step price or step number is not set:%d_%d ", *cart.ProductId, *cart.SizeId)) } //购买箱数 boxQuantity := int(math.Ceil(float64(*cart.PurchaseQuantity) / float64(*sizePrice.EachBoxNum))) @@ -137,6 +141,10 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo stepQuantityList = append(stepQuantityList, tmpQuantity) tmpMinBuyNum++ } + sizeCapacity := snapShot.SizeInfo.Capacity + if sizeInfo, ok := mapSize[*cart.SizeId]; ok { + sizeCapacity = *sizeInfo.Capacity + } //根据数量获取阶梯价格中对应的价格 itemPrice := step_price.GetCentStepPrice(boxQuantity, stepNum, stepPrice) //如果有配件，单价也要加入配件价格 @@ -145,12 +153,34 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo itemPrice += *curFittingInfo.Price } } + fittingName := snapShot.FittingInfo.FittingName + if fittingInfo, ok := mapModel[*cart.FittingId]; ok { + fittingName = *fittingInfo.Name + } totalPrice := itemPrice * (*cart.PurchaseQuantity) + productCover := "" //产品封面图 + productName := snapShot.ProductInfo.ProductName + productSn := snapShot.ProductInfo.ProductSn + var productCoverMetadata interface{} + if productInfo, ok := mapProduct[*cart.ProductId]; ok { + productCover = *productInfo.Cover + productName = *productInfo.Title + productSn = *productInfo.Sn + if metadata, ok := mapResourceMetadata[*productInfo.Cover]; ok { + productCoverMetadata = metadata + } + } item := types.CartItem{ - ProductId: *cart.ProductId, + ProductInfo: types.ProductInfo{ + ProductId: *cart.ProductId, + ProductName: productName, + ProductSn: productSn, + ProductCover: productCover, + ProductCoverMetadata: productCoverMetadata, + }, SizeInfo: types.SizeInfo{ SizeId: *cart.SizeId, - Capacity: snapShot.SizeInfo.Capacity, + Capacity: sizeCapacity, Title: types.SizeTitle{ Cm: snapShot.SizeInfo.Cm, Inch: snapShot.SizeInfo.Inch, @@ -158,7 +188,7 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo }, FittingInfo: types.FittingInfo{ FittingId: *cart.FittingId, - FittingName: snapShot.FittingInfo.FittingName, + FittingName: fittingName, }, ItemPrice: fmt.Sprintf("%.3f", format.CentitoDollar(itemPrice)), TotalPrice: fmt.Sprintf("%.3f", format.CentitoDollar(totalPrice)), @@ -194,12 +224,13 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo // 获取相关信息 type GetRelationInfoReq struct { - Carts []gmodel.FsShoppingCart - MapSize map[int64]gmodel.FsProductSize - MapModel map[int64]gmodel.FsProductModel3d - MapTemplate map[int64]gmodel.FsProductTemplateV2 - MapSizePrice map[string]gmodel.FsProductPrice - MapProduct map[int64]struct{} + Carts []gmodel.FsShoppingCart + MapSize map[int64]gmodel.FsProductSize + MapModel map[int64]gmodel.FsProductModel3d + MapTemplate map[int64]gmodel.FsProductTemplateV2 + MapSizePrice map[string]gmodel.FsProductPrice + MapProduct map[int64]gmodel.FsProduct + MapResourceMetadata map[string]interface{} } func (l *GetCartsLogic) GetRelationInfo(req GetRelationInfoReq) error { @@ -215,13 +246,28 @@ func (l *GetCartsLogic) GetRelationInfo(req GetRelationInfoReq) error { productIds = append(productIds, *req.Carts[index].ProductId) } //获取产品集合 - productList, err := l.svcCtx.AllModels.FsProduct.GetProductListByIds(l.ctx, productIds, "", "id") + productList, err := l.svcCtx.AllModels.FsProduct.GetProductListByIds(l.ctx, productIds, "") if err != nil { logx.Error(err) return errors.New("failed to get product list") } + resourceIds := make([]string, 0, len(productList)) for _, v := range productList { - req.MapProduct[v.Id] = struct{}{} + req.MapProduct[v.Id] = v + resourceIds = append(resourceIds, s3url_to_s3id.GetS3ResourceIdFormUrl(*v.Cover)) + } + //根据resourceUrls找到对应的元数据 + resourceMetadataList, err := l.svcCtx.AllModels.FsResource.FindAllByResourceIds(l.ctx, resourceIds) + if err != nil { + logx.Error(err) + return errors.New("failed to get resource list") + } + for _, v := range resourceMetadataList { + var metadata interface{} + if v.Metadata != nil { + _ = json.Unmarshal(*v.Metadata, &metadata) + } + req.MapResourceMetadata[*v.ResourceUrl] = metadata } //获取尺寸列表 sizeList, err := l.svcCtx.AllModels.FsProductSize.GetAllByIds(l.ctx, sizeIds, "") diff --git a/server/shopping-cart/internal/types/types.go b/server/shopping-cart/internal/types/types.go index 231c717e..1ed8b661 100644 --- a/server/shopping-cart/internal/types/types.go +++ b/server/shopping-cart/internal/types/types.go @@ -44,7 +44,7 @@ type GetCartsRsp struct { } type CartItem struct { - ProductId int64 `json:"product_id"` //产品id + ProductInfo ProductInfo `json:"product_info"` //产品信息 SizeInfo SizeInfo `json:"size_info"` //尺寸信息 FittingInfo FittingInfo `json:"fitting_info"` //配件信息 ItemPrice string `json:"item_price"` //单价 @@ -56,6 +56,14 @@ type CartItem struct { InvalidDescription string `json:"invalid_description"` //无效原因 } +type ProductInfo struct { + ProductId int64 `json:"product_id"` //产品id + ProductName string `json:"product_name"` + ProductSn string `json:"product_sn"` + ProductCover string `json:"product_cover"` //产品图 + ProductCoverMetadata interface{} `json:"product_cover_metadata"` //产品图元数据 +} + type SizeInfo struct { SizeId int64 `json:"size_id"` //尺寸id Capacity string `json:"capacity"` //尺寸名称 @@ -90,6 +98,7 @@ type CalculateItem struct { } type CalculateCartPriceRsp struct { + SubTotalPrice string `json:"sub_total_price"` CalculateResultList []CalculateResultItem `json:"calculate_result_list"` } diff --git a/server_api/product-template-tag.api b/server_api/product-template-tag.api index bdc513b7..d663e109 100644 --- a/server_api/product-template-tag.api +++ b/server_api/product-template-tag.api @@ -24,4 +24,5 @@ type GetProductTemplateTagsRsp { TemplateTag string `json:"template_tag"` Cover string `json:"cover"` CoverMetadata interface{} `json:"cover_metadata"` + Colors interface{} `json:"colors"` } \ No newline at end of file diff --git a/server_api/shopping-cart.api b/server_api/shopping-cart.api index 5c3da538..216bdfe2 100644 --- a/server_api/shopping-cart.api +++ b/server_api/shopping-cart.api @@ -63,7 +63,7 @@ type GetCartsRsp { CartList []CartItem `json:"cart_list"` } type CartItem { - ProductId int64 `json:"product_id"` //产品id + ProductInfo ProductInfo `json:"product_info"` //产品信息 SizeInfo SizeInfo `json:"size_info"` //尺寸信息 FittingInfo FittingInfo `json:"fitting_info"` //配件信息 ItemPrice string `json:"item_price"` //单价 @@ -74,6 +74,13 @@ type CartItem { IsInvalid bool `json:"is_invalid"` //是否无效 InvalidDescription string `json:"invalid_description"` //无效原因 } +type ProductInfo { + ProductId int64 `json:"product_id"` //产品id + ProductName string `json:"product_name"` + ProductSn string `json:"product_sn"` + ProductCover string `json:"product_cover"` //产品图 + ProductCoverMetadata interface{} `json:"product_cover_metadata"` //产品图元数据 +} type SizeInfo { SizeId int64 `json:"size_id"` //尺寸id Capacity string `json:"capacity"` //尺寸名称 @@ -104,6 +111,7 @@ type CalculateItem { PurchaseQuantity int64 `json:"purchase_quantity"` //数量 } type CalculateCartPriceRsp { + SubTotalPrice string `json:"sub_total_price"` CalculateResultList []CalculateResultItem `json:"calculate_result_list"` } type CalculateResultItem { diff --git a/service/repositories/order.go b/service/repositories/order.go index fcc76367..b9e4f3f5 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -251,7 +251,7 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe return nil }) if err != nil { - + fmt.Println(err) } return &CreateRes{ ErrorCode: errorCode, diff --git a/utils/shopping_cart/verify_shopping_cart_channged.go b/utils/shopping_cart/verify_shopping_cart_channged.go index 10315ffe..fc43c0fa 100644 --- a/utils/shopping_cart/verify_shopping_cart_channged.go +++ b/utils/shopping_cart/verify_shopping_cart_channged.go @@ -15,7 +15,7 @@ type VerifyShoppingCartSnapshotDataChangeReq struct { MapTemplate map[int64]gmodel.FsProductTemplateV2 MapCartChange map[int64]string MapSnapshot map[int64]CartSnapshot - MapProduct map[int64]struct{} + MapProduct map[int64]gmodel.FsProduct } func VerifyShoppingCartSnapshotDataChange(req VerifyShoppingCartSnapshotDataChangeReq) error {