From c7a2cf7d1c89378d4b75feb3dbd2cba27f22d22b Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Tue, 26 Sep 2023 15:14:08 +0800 Subject: [PATCH 01/13] =?UTF-8?q?fix:=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/gmodel/fs_order_logic.go | 33 +++--- model/gmodel/fs_shopping_cart_logic.go | 18 ++++ service/repositories/order.go | 134 +++++++++++++++++-------- 3 files changed, 125 insertions(+), 60 deletions(-) diff --git a/model/gmodel/fs_order_logic.go b/model/gmodel/fs_order_logic.go index 19bae9ae..fcd0aee1 100644 --- a/model/gmodel/fs_order_logic.go +++ b/model/gmodel/fs_order_logic.go @@ -95,23 +95,22 @@ type OrderStatus struct { // 订单商品 type OrderProduct struct { - TotalPrice AmountInfo `json:"amount"` // 商品总价 - ExpectedDeliveryTime *time.Time `json:"expected_delivery_time"` // 预计到货时间 - PurchaseQuantity PurchaseQuantity `json:"purchase_quantity"` // 购买数量 - ProductID int64 `json:"product_id"` // 商品ID - ProductName string `json:"product_name"` // 商品名称 - ItemPrice AmountInfo `json:"product_price"` // 商品单价 - ProductSnapshot interface{} `json:"product_snapshot"` // 商品快照 - ShoppingCartSnapshot *FsShoppingCart `json:"shopping_cart_snapshot"` // 购物车快照 - ShoppingCartSnapshotInfo map[string]interface{} `json:"shopping_cart_snapshot_info"` // 商品封面 - ProductCover string `json:"product_cover"` // 商品封面 - ProductCoverMetadata map[string]interface{} `json:"product_cover_metadata"` // 商品封面 - ProductSn string `json:"product_sn"` // 商品编码 - DiyInformation *UserDiyInformation `json:"diy_information"` - SizeInfo *OrderProductSizeInfo `json:"size_info"` - FittingInfo *OrderProductFittingInfo `json:"fitting_info"` - StepNum []int `json:"step_num"` // 阶梯数量 - IsHighlyCustomized int64 `json:"is_highly_customized"` + TotalPrice AmountInfo `json:"amount"` // 商品总价 + ExpectedDeliveryTime *time.Time `json:"expected_delivery_time"` // 预计到货时间 + PurchaseQuantity PurchaseQuantity `json:"purchase_quantity"` // 购买数量 + ProductID int64 `json:"product_id"` // 商品ID + ProductName string `json:"product_name"` // 商品名称 + ItemPrice AmountInfo `json:"product_price"` // 商品单价 + ProductSnapshot interface{} `json:"product_snapshot"` // 商品快照 + ShoppingCartSnapshot *FsShoppingCartData `json:"shopping_cart_snapshot"` // 购物车快照 + ProductCover string `json:"product_cover"` // 商品封面 + ProductCoverMetadata map[string]interface{} `json:"product_cover_metadata"` // 商品封面 + ProductSn string `json:"product_sn"` // 商品编码 + DiyInformation *UserDiyInformation `json:"diy_information"` + SizeInfo *OrderProductSizeInfo `json:"size_info"` + FittingInfo *OrderProductFittingInfo `json:"fitting_info"` + StepNum []int `json:"step_num"` // 阶梯数量 + IsHighlyCustomized int64 `json:"is_highly_customized"` } type PurchaseQuantity struct { Current interface{} `json:"current"` diff --git a/model/gmodel/fs_shopping_cart_logic.go b/model/gmodel/fs_shopping_cart_logic.go index 63947f74..782bab82 100644 --- a/model/gmodel/fs_shopping_cart_logic.go +++ b/model/gmodel/fs_shopping_cart_logic.go @@ -2,6 +2,7 @@ package gmodel import ( "context" + "time" ) func (m *FsShoppingCartModel) TableName() string { @@ -16,6 +17,23 @@ type RelaFsShoppingCart struct { ShoppingCartProductModel3dList []*FsProductModel3d `json:"shopping_cart_product_model3d_list" gorm:"foreignkey:product_id;references:product_id"` ShoppingCartProductModel3dFitting *FsProductModel3d `json:"shopping_cart_product_model3d_list_fitting" gorm:"foreignkey:fitting_id;references:id"` } +type FsShoppingCartData struct { + Id int64 `gorm:"primary_key;default:0;auto_increment;" json:"id"` // id + UserId *int64 `gorm:"default:0;" json:"user_id"` // 用户id + ProductId *int64 `gorm:"default:0;" json:"product_id"` // 产品id + TemplateId *int64 `gorm:"default:0;" json:"template_id"` // 模板id + ModelId *int64 `gorm:"default:0;" json:"model_id"` // 模型id + SizeId *int64 `gorm:"default:0;" json:"size_id"` // 尺寸id + LightId *int64 `gorm:"default:0;" json:"light_id"` // 灯光id + FittingId *int64 `gorm:"default:0;" json:"fitting_id"` // 配件id + PurchaseQuantity *int64 `gorm:"default:0;" json:"purchase_quantity"` // 购买数量 + Snapshot *map[string]interface{} `gorm:"default:'';" json:"snapshot"` // + SnapshotData *string `gorm:"default:'';" json:"snapshot_data"` // + IsSelected *int64 `gorm:"default:0;" json:"is_selected"` // 是否被选中 0非 1是 + IsHighlyCustomized *int64 `gorm:"default:0;" json:"is_highly_customized"` // 是否高度定制 0非 1是（针对客人高度定制只能后台增加如购物车） + Ctime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"ctime"` // + Utime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"utime"` // +} // 快照json数据结构 // 购物车快照数据结构 diff --git a/service/repositories/order.go b/service/repositories/order.go index b7abc1d0..0844193e 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -892,7 +892,32 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe if shoppingCart.ShoppingCartProduct.CoverResource != nil && shoppingCart.ShoppingCartProduct.CoverResource.Metadata != nil { json.Unmarshal(*shoppingCart.ShoppingCartProduct.CoverResource.Metadata, &productCoverMetadata) } - orderProductList = append(orderProductList, gmodel.OrderProduct{ + snapshot, err := d.OrderDetailSnapshotHandler(ctx, shoppingCart.FsShoppingCart.Snapshot) + if err != nil { + return err + } + var shoppingCartSnapshotInter = &gmodel.FsShoppingCartData{ + Id: shoppingCart.FsShoppingCart.Id, + UserId: shoppingCart.FsShoppingCart.UserId, + ProductId: shoppingCart.FsShoppingCart.ProductId, + TemplateId: shoppingCart.FsShoppingCart.TemplateId, + ModelId: shoppingCart.FsShoppingCart.ModelId, + SizeId: shoppingCart.FsShoppingCart.SizeId, + LightId: shoppingCart.FsShoppingCart.LightId, + FittingId: shoppingCart.FsShoppingCart.FittingId, + PurchaseQuantity: shoppingCart.FsShoppingCart.PurchaseQuantity, + Snapshot: &snapshot, + SnapshotData: shoppingCart.FsShoppingCart.Snapshot, + IsSelected: shoppingCart.FsShoppingCart.IsSelected, + IsHighlyCustomized: shoppingCart.FsShoppingCart.IsHighlyCustomized, + Ctime: shoppingCart.FsShoppingCart.Ctime, + Utime: shoppingCart.FsShoppingCart.Utime, + } + var purchaseQuantityInter = gmodel.PurchaseQuantity{ + Current: *shoppingCart.PurchaseQuantity, + Initiate: *shoppingCart.PurchaseQuantity, + } + productInter := gmodel.OrderProduct{ TotalPrice: order.GetAmountInfo(order.GetAmountInfoReq{ ExchangeRate: in.ExchangeRate, Initiate: productTotalPrice, @@ -901,10 +926,7 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe OriginalCurrency: in.OriginalCurrency, }), ExpectedDeliveryTime: &in.ExpectedDeliveryTime, - PurchaseQuantity: gmodel.PurchaseQuantity{ - Current: *shoppingCart.PurchaseQuantity, - Initiate: *shoppingCart.PurchaseQuantity, - }, + PurchaseQuantity: purchaseQuantityInter, ProductID: *shoppingCart.ProductId, ProductCover: *shoppingCart.ShoppingCartProduct.Cover, ProductCoverMetadata: productCoverMetadata, @@ -917,7 +939,7 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe OriginalCurrency: in.OriginalCurrency, }), ProductSnapshot: shoppingCart.ShoppingCartProduct, - ShoppingCartSnapshot: &shoppingCart.FsShoppingCart, + ShoppingCartSnapshot: shoppingCartSnapshotInter, ProductSn: *shoppingCart.ShoppingCartProduct.Sn, DiyInformation: &shoppingCartSnapshot.UserDiyInformation, FittingInfo: &gmodel.OrderProductFittingInfo{ @@ -934,7 +956,8 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe }, StepNum: stepNum, IsHighlyCustomized: *shoppingCart.IsHighlyCustomized, - }) + } + orderProductList = append(orderProductList, productInter) } subtotal = order.GetAmountInfo(order.GetAmountInfoReq{ @@ -1060,6 +1083,66 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe }, nil } +// 处理订单购物车快照 +func (d *defaultOrder) OrderDetailSnapshotHandler(ctx context.Context, req *string) (res map[string]interface{}, err error) { + var snapshot map[string]interface{} + json.Unmarshal([]byte(*req), &snapshot) + snapshotFittingInfoData, snapshotFittingInfoEx := snapshot["fitting_info"] + var fittingInfoMap map[string]interface{} + if snapshotFittingInfoEx { + var snapshotFittingInfoJson map[string]interface{} + var fittingName string + snapshotFittingInfo := snapshotFittingInfoData.(map[string]interface{}) + snapshotFittingInfoJsonData, snapshotFittingInfoJsonEx := snapshotFittingInfo["fitting_json"] + if snapshotFittingInfoJsonEx { + json.Unmarshal([]byte(snapshotFittingInfoJsonData.(string)), &snapshotFittingInfoJson) + } + fittingNameData, fittingNameEx := snapshotFittingInfo["fitting_name"] + if fittingNameEx { + fittingName = fittingNameData.(string) + } + fittingInfoMap = make(map[string]interface{}, 2) + fittingInfoMap["fitting_json"] = snapshotFittingInfoJson + fittingInfoMap["fitting_name"] = fittingName + } + snapshot["fitting_info"] = fittingInfoMap + + snapshotModelInfoData, snapshotModelInfoEx := snapshot["model_info"] + var modelInfoMap map[string]interface{} + if snapshotModelInfoEx { + var snapshotModelInfoJson map[string]interface{} + snapshotModelInfo := snapshotModelInfoData.(map[string]interface{}) + snapshotModelInfoJsonData, snapshotModelInfoJsonEx := snapshotModelInfo["model_json"] + if snapshotModelInfoJsonEx { + json.Unmarshal([]byte(snapshotModelInfoJsonData.(string)), &snapshotModelInfoJson) + } + modelInfoMap = make(map[string]interface{}, 1) + modelInfoMap["model_json"] = snapshotModelInfoJson + } + snapshot["model_info"] = modelInfoMap + + snapshotTemplateInfoData, snapshotTemplateInfoEx := snapshot["template_info"] + var templateInfoMap map[string]interface{} + if snapshotTemplateInfoEx { + var snapshotTemplateInfoJson map[string]interface{} + var templateTag string + snapshotTemplateInfo := snapshotTemplateInfoData.(map[string]interface{}) + snapshotTemplateInfoJsonData, snapshotTemplateInfoJsonEx := snapshotTemplateInfo["template_json"] + if snapshotTemplateInfoJsonEx { + json.Unmarshal([]byte(snapshotTemplateInfoJsonData.(string)), &snapshotTemplateInfoJson) + } + templateTagData, templateTagEx := snapshotTemplateInfo["template_tag"] + if templateTagEx { + templateTag = templateTagData.(string) + } + templateInfoMap = make(map[string]interface{}, 2) + templateInfoMap["template_json"] = snapshotTemplateInfoJson + templateInfoMap["template_tag"] = templateTag + } + snapshot["template_info"] = templateInfoMap + return snapshot, nil +} + // 详情处理 func (d *defaultOrder) OrderDetailHandler(ctx context.Context, orderInfo *gmodel.FsOrder, original int64) (res *DetailRes, err error) { var orderDetail gmodel.OrderDetail @@ -1076,42 +1159,7 @@ func (d *defaultOrder) OrderDetailHandler(ctx context.Context, orderInfo *gmodel orderDetail.OrderProduct[orderProductKey].TotalPrice = order.GetAmountInfoFormat(&orderProduct.TotalPrice) orderDetail.OrderProduct[orderProductKey].PurchaseQuantity = order.GetPurchaseQuantity(&orderProduct.PurchaseQuantity) orderDetail.OrderProduct[orderProductKey].ProductSnapshot = nil - var snapshot map[string]interface{} - if orderDetail.OrderProduct[orderProductKey].ShoppingCartSnapshot.Snapshot != nil { - json.Unmarshal([]byte(*orderDetail.OrderProduct[orderProductKey].ShoppingCartSnapshot.Snapshot), &snapshot) - } - snapshotfittingInfoData, snapshotfittingInfoEx := snapshot["fitting_info"] - var snapshotfittingInfoJson map[string]interface{} - if snapshotfittingInfoEx { - snapshotfittingInfo := snapshotfittingInfoData.(map[string]interface{}) - snapshotfittingInfoJsonData, snapshotfittingInfoJsonEx := snapshotfittingInfo["fitting_json"] - if snapshotfittingInfoJsonEx { - var snapshotfittingInfoJson map[string]interface{} - json.Unmarshal([]byte(snapshotfittingInfoJsonData.(string)), &snapshotfittingInfoJson) - } - } - snapshot["fitting_info"] = snapshotfittingInfoJson - snapshotModelInfoData, snapshotModelInfoEx := snapshot["model_info"] - var snapshotModelInfoJson map[string]interface{} - if snapshotModelInfoEx { - snapshotModelInfo := snapshotModelInfoData.(map[string]interface{}) - snapshotModelInfoJsonData, snapshotModelInfoJsonEx := snapshotModelInfo["model_json"] - if snapshotModelInfoJsonEx { - json.Unmarshal([]byte(snapshotModelInfoJsonData.(string)), &snapshotModelInfoJson) - } - } - snapshot["model_info"] = snapshotModelInfoJson - snapshotTemplateInfoData, snapshotTemplateInfoEx := snapshot["template_info"] - var snapshotTemplateInfoJson map[string]interface{} - if snapshotTemplateInfoEx { - snapshotTemplateInfo := snapshotTemplateInfoData.(map[string]interface{}) - snapshotTemplateInfoJsonData, snapshotTemplateInfoJsonEx := snapshotTemplateInfo["template_json"] - if snapshotTemplateInfoJsonEx { - json.Unmarshal([]byte(snapshotTemplateInfoJsonData.(string)), &snapshotTemplateInfoJson) - } - } - snapshot["template_info"] = snapshotTemplateInfoJson - orderDetail.OrderProduct[orderProductKey].ShoppingCartSnapshotInfo = snapshot + orderDetail.OrderProduct[orderProductKey].ShoppingCartSnapshot.SnapshotData = nil } orderDetail.OrderInfo.StatusLink = order.GetOrderStatusLinkUser(orderDetail.OrderInfo.DeliveryMethod, orderDetail.OrderInfo.StatusLink) orderDetail.OrderAmount.Deposit.PayAmount = order.GetAmountInfoFormat(&orderDetail.OrderAmount.Deposit.PayAmount) From 821e36281a9e1fe6231a4dcd87d978219487692c Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Tue, 26 Sep 2023 15:25:05 +0800 Subject: [PATCH 02/13] =?UTF-8?q?fix:=E6=94=AF=E4=BB=98?= 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 0844193e..0635c3b9 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -268,6 +268,7 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess StatusTitle: constants.OrderStatusMessage[statusCode], } statusLink = order.UpdateOrderStatusLink(ress.OrderDetailOriginal.OrderInfo.StatusLink, gmodel.OrderStatus{ + Ctime: &ntime, Utime: &ntime, StatusCode: statusCode, StatusTitle: constants.OrderStatusMessage[statusCode], @@ -343,8 +344,7 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess PayTitle: &payTitle, }) // 更新订单信息 - var sql string = fmt.Sprintf(", `utime` = '%s'", ntime) - uOrderDetail["pay_status"] = orderPayStatusCode + var sql string = fmt.Sprintf(", `utime` = '%s', `pay_status` = %d", ntime, orderPayStatusCode) uOrderDetail["order_info"] = struct { Utime *time.Time `json:"utime"` Status gmodel.OrderStatus `json:"status"` From 821cbb8879edfb107ca967d6e3e0e9cc1e1b151f Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Tue, 26 Sep 2023 15:28:17 +0800 Subject: [PATCH 03/13] fix --- .../internal/logic/calculatecartpricelogic.go | 43 +++++++--------- .../internal/logic/getcartslogic.go | 43 ++++++++-------- server/shopping-cart/internal/types/types.go | 2 + server_api/shopping-cart.api | 2 + service/repositories/shopping-cart.go | 51 +++++++------------ 5 files changed, 63 insertions(+), 78 deletions(-) diff --git a/server/shopping-cart/internal/logic/calculatecartpricelogic.go b/server/shopping-cart/internal/logic/calculatecartpricelogic.go index fc461746..0317398e 100644 --- a/server/shopping-cart/internal/logic/calculatecartpricelogic.go +++ b/server/shopping-cart/internal/logic/calculatecartpricelogic.go @@ -2,9 +2,9 @@ package logic import ( "context" + "encoding/json" "errors" "fmt" - "fusenapi/constants" "fusenapi/model/gmodel" "fusenapi/server/shopping-cart/internal/svc" "fusenapi/server/shopping-cart/internal/types" @@ -67,33 +67,24 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri } sizeIds := make([]int64, 0, len(carts)) productIds := make([]int64, 0, len(carts)) - fittingIds := make([]int64, 0, len(carts)) + modelIds := make([]int64, 0, len(carts)) //模型+配件 for _, v := range carts { sizeIds = append(sizeIds, *v.SizeId) productIds = append(productIds, *v.ProductId) + modelIds = append(modelIds, *v.ModelId) if *v.FittingId > 0 { - fittingIds = append(fittingIds, *v.FittingId) + modelIds = append(modelIds, *v.FittingId) } } - //根据sizeid获取价格列表 - priceList, err := l.svcCtx.AllModels.FsProductPrice.GetPriceListByProductIdsSizeIds(l.ctx, productIds, sizeIds) - if err != nil { - logx.Error(err) - return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get price list") - } - mapPrice := make(map[string]gmodel.FsProductPrice) - for _, v := range priceList { - mapPrice[fmt.Sprintf("%d_%d", *v.ProductId, *v.SizeId)] = v - } //获取配件列表(只有id跟价格) - fittingList, err := l.svcCtx.AllModels.FsProductModel3d.GetAllByIdsTag(l.ctx, fittingIds, constants.TAG_PARTS, "id,price") + modelList, err := l.svcCtx.AllModels.FsProductModel3d.GetAllByIds(l.ctx, modelIds, "id,step_price,price") if err != nil { logx.Error(err) - return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get fitting list") + return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get model list") } - mapFitting := make(map[int64]int64) - for _, v := range fittingList { - mapFitting[v.Id] = *v.Price + mapModel := make(map[int64]gmodel.FsProductModel3d) + for _, v := range modelList { + mapModel[v.Id] = v } //开始计算价格 calculateResultList := make([]types.CalculateResultItem, 0, len(req.CalculateList)) @@ -102,9 +93,13 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri err = l.svcCtx.MysqlConn.Transaction(func(tx *gorm.DB) error { shoppingCartModel := gmodel.NewFsShoppingCartModel(tx) for _, cart := range carts { - sizePrice, ok := mapPrice[fmt.Sprintf("%d_%d", *cart.ProductId, *cart.SizeId)] + modelInfo, ok := mapModel[*cart.ModelId] if !ok { - return errors.New(fmt.Sprintf("there carts contain some one which have no price info:%d_%d", *cart.ProductId, *cart.SizeId)) + return err + } + var stepPrice gmodel.StepPriceJsonStruct + if err = json.Unmarshal(*modelInfo.StepPrice, &stepPrice); err != nil { + return err } //请求的数量 reqPurchaseQuantity := mapCalculateQuantity[cart.Id].PurchaseQuantity @@ -115,16 +110,15 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri //如果有配件，单价也要加入配件价格 fittingPrice := int64(0) if *cart.FittingId > 0 { - if fPrice, ok := mapFitting[*cart.FittingId]; ok { - fittingPrice = fPrice + if fittingInfo, ok := mapModel[*cart.FittingId]; ok { + fittingPrice = *fittingInfo.Price } else { return errors.New(fmt.Sprintf("cart contain some one witch lose fitting:%d", *cart.FittingId)) } } //计算价格 - itemPrice, totalPrice, _, _, err := l.svcCtx.Repositories.NewShoppingCart.CaculateCartPrice(reqPurchaseQuantity, &sizePrice, fittingPrice) + itemPrice, totalPrice, err := l.svcCtx.Repositories.NewShoppingCart.CaculateStepPrice(reqPurchaseQuantity, stepPrice, fittingPrice) if err != nil { - logx.Error(err) return err } calculateResultList = append(calculateResultList, types.CalculateResultItem{ @@ -149,6 +143,7 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri return nil }) if err != nil { + logx.Error(err) return resp.SetStatusWithMessage(basic.CodeDbSqlErr, err.Error()) } return resp.SetStatusWithMessage(basic.CodeOK, "success", types.CalculateCartPriceRsp{ diff --git a/server/shopping-cart/internal/logic/getcartslogic.go b/server/shopping-cart/internal/logic/getcartslogic.go index 1f798027..f73025a8 100644 --- a/server/shopping-cart/internal/logic/getcartslogic.go +++ b/server/shopping-cart/internal/logic/getcartslogic.go @@ -63,7 +63,6 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo 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{}) ) @@ -73,7 +72,6 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo MapSize: mapSize, MapModel: mapModel, MapTemplate: mapTemplate, - MapSizePrice: mapSizePrice, MapProduct: mapProduct, MapResourceMetadata: mapResourceMetadata, }) @@ -101,21 +99,32 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo list := make([]types.CartItem, 0, len(carts)) for _, cart := range carts { snapShot := mapSnapshot[cart.Id] - sizePrice, ok := mapSizePrice[fmt.Sprintf("%d_%d", *cart.ProductId, *cart.SizeId)] + modelInfo, ok := mapModel[*cart.ModelId] if !ok { - return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("the size`s price info is not exists:%d_%d", *cart.ProductId, *cart.SizeId)) + return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("the size`s model info is not exists:%d_%d", *cart.ProductId, *cart.SizeId)) } + var stepPrice gmodel.StepPriceJsonStruct + if err = json.Unmarshal(*modelInfo.StepPrice, &stepPrice); err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeJsonErr, fmt.Sprintf("failed to parse model step price:%d", *cart.ModelId)) + } + //购买数量步进量 + stepPurchaseQuantity := *modelInfo.PackedUnit //如果有配件，单价也要加入配件价格 fittingPrice := int64(0) if *cart.FittingId > 0 { - if curFittingInfo, ok := mapModel[*cart.FittingId]; ok { - fittingPrice = *curFittingInfo.Price - } else { + curFittingInfo, ok := mapModel[*cart.FittingId] + if !ok { return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("cart contain some one witch lose fitting:%d", *cart.FittingId)) } + fittingPrice = *curFittingInfo.Price + //取大的为步进量基数 + if *curFittingInfo.PackedUnit > stepPurchaseQuantity { + stepPurchaseQuantity = *curFittingInfo.PackedUnit + } } - //计算价格 - itemPrice, totalPrice, _, _, err := l.svcCtx.Repositories.NewShoppingCart.CaculateCartPrice(*cart.PurchaseQuantity, &sizePrice, fittingPrice) + //计算阶梯价格 + itemPrice, totalPrice, err := l.svcCtx.Repositories.NewShoppingCart.CaculateStepPrice(*cart.PurchaseQuantity, stepPrice, fittingPrice) if err != nil { logx.Error(err) return resp.SetStatusWithMessage(basic.CodeServiceErr, err.Error()) @@ -175,10 +184,12 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo Slogan: snapShot.UserDiyInformation.Slogan, }, PurchaseQuantity: *cart.PurchaseQuantity, - MinPurchaseQuantity: *sizePrice.EachBoxNum * (*sizePrice.MinBuyNum), - StepPurchaseQuantity: *sizePrice.EachBoxNum, + MinPurchaseQuantity: stepPrice.MinBuyUnitsNum, + StepPurchaseQuantity: stepPurchaseQuantity, IsHighlyCustomized: *cart.IsHighlyCustomized > 0, IsSelected: *cart.IsSelected > 0, + TemplateTag: *mapTemplate[*cart.TemplateId].TemplateTag, + Logo: snapShot.Logo, } //是否有失效的 if description, ok := mapCartChange[cart.Id]; ok { @@ -206,7 +217,6 @@ type GetRelationInfoReq struct { 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{} } @@ -274,15 +284,6 @@ func (l *GetCartsLogic) GetRelationInfo(req GetRelationInfoReq) error { for _, v := range templateList { req.MapTemplate[v.Id] = v } - //根据sizeid获取价格列表 - priceList, err := l.svcCtx.AllModels.FsProductPrice.GetPriceListByProductIdsSizeIds(l.ctx, productIds, sizeIds) - if err != nil { - logx.Error(err) - return errors.New("failed to get cart`s product price list") - } - for _, v := range priceList { - req.MapSizePrice[fmt.Sprintf("%d_%d", *v.ProductId, *v.SizeId)] = v - } return nil } diff --git a/server/shopping-cart/internal/types/types.go b/server/shopping-cart/internal/types/types.go index 366f7858..e905920a 100644 --- a/server/shopping-cart/internal/types/types.go +++ b/server/shopping-cart/internal/types/types.go @@ -53,6 +53,8 @@ type CartItem struct { IsInvalid bool `json:"is_invalid"` //是否无效 InvalidDescription string `json:"invalid_description"` //无效原因 IsSelected bool `json:"is_selected"` //是否选中 + TemplateTag string `json:"template_tag"` //模板标签 + Logo string `json:"logo"` } type ProductInfo struct { diff --git a/server_api/shopping-cart.api b/server_api/shopping-cart.api index 89019534..d38e4b12 100644 --- a/server_api/shopping-cart.api +++ b/server_api/shopping-cart.api @@ -70,6 +70,8 @@ type CartItem { IsInvalid bool `json:"is_invalid"` //是否无效 InvalidDescription string `json:"invalid_description"` //无效原因 IsSelected bool `json:"is_selected"` //是否选中 + TemplateTag string `json:"template_tag"` //模板标签 + Logo string `json:"logo"` } type ProductInfo { ProductId int64 `json:"product_id"` //产品id diff --git a/service/repositories/shopping-cart.go b/service/repositories/shopping-cart.go index dd2b83eb..afc7e18f 100644 --- a/service/repositories/shopping-cart.go +++ b/service/repositories/shopping-cart.go @@ -3,15 +3,10 @@ package repositories import ( "encoding/json" "errors" - "fmt" "fusenapi/model/gmodel" - "fusenapi/utils/format" "fusenapi/utils/hash" - "fusenapi/utils/step_price" "github.com/aws/aws-sdk-go/aws/session" - "github.com/zeromicro/go-zero/core/logx" "gorm.io/gorm" - "math" "strings" ) @@ -33,7 +28,7 @@ type ( // 校验订单 VerifyShoppingCartSnapshotDataChange(req VerifyShoppingCartSnapshotDataChangeReq) error //计算购物车价格 - CaculateCartPrice(purchaseQuantity int64, productPrice *gmodel.FsProductPrice, fittingPrice int64) (ItemPrice, totalPrice int64, stepNum, stepPrice []int, err error) + CaculateStepPrice(purchaseQuantity int64, stepPrice gmodel.StepPriceJsonStruct, fittingPrice int64) (totalPrice, itemPrice int64, err error) } ) @@ -132,33 +127,23 @@ func (d *defaultShoppingCart) VerifyShoppingCartSnapshotDataChange(req VerifySho } // 计算价格 -func (d *defaultShoppingCart) CaculateCartPrice(purchaseQuantity int64, productPrice *gmodel.FsProductPrice, fittingPrice int64) (ItemPrice, totalPrice int64, stepNum, stepPrice []int, err error) { - //阶梯数量切片 - stepNum, err = format.StrSlicToIntSlice(strings.Split(*productPrice.StepNum, ",")) - if err != nil { - logx.Error(err) - return 0, 0, nil, nil, errors.New(fmt.Sprintf("failed to parse step number:%d_%d", *productPrice.ProductId, *productPrice.SizeId)) +func (d *defaultShoppingCart) CaculateStepPrice(purchaseQuantity int64, stepPrice gmodel.StepPriceJsonStruct, fittingPrice int64) (totalPrice, itemPrice int64, err error) { + l := len(stepPrice.PriceRange) + if l == 0 { + return 0, 0, errors.New("price range is not set") } - lenStepNum := len(stepNum) - //阶梯价格切片 - stepPrice, err = format.StrSlicToIntSlice(strings.Split(*productPrice.StepPrice, ",")) - if err != nil { - logx.Error(err) - return 0, 0, nil, nil, errors.New(fmt.Sprintf("failed to parse step price:%d_%d", *productPrice.ProductId, *productPrice.SizeId)) + //遍历查询合适的价格 + for k, v := range stepPrice.PriceRange { + //购买数量>起点 + if purchaseQuantity > v.StartQuantity { + //最后一个 || 小于等于终点 + if k == l-1 || purchaseQuantity <= v.EndQuantity { + itemPrice = v.Price + fittingPrice + return itemPrice * purchaseQuantity, itemPrice, nil + } + } } - lenStepPrice := len(stepPrice) - if lenStepPrice == 0 || lenStepNum == 0 { - return 0, 0, nil, nil, errors.New(fmt.Sprintf("step price or step number is not set:%d_%d", *productPrice.ProductId, *productPrice.SizeId)) - } - //请求的数量 - reqPurchaseQuantity := purchaseQuantity - //购买箱数 - boxQuantity := int(math.Ceil(float64(reqPurchaseQuantity) / float64(*productPrice.EachBoxNum))) - //根据数量获取阶梯价格中对应的价格 - itemPrice := step_price.GetCentStepPrice(boxQuantity, stepNum, stepPrice) - //如果有配件，单价也要加入配件价格 - itemPrice += fittingPrice - //单个购物车总价 - totalPrice = itemPrice * reqPurchaseQuantity - return itemPrice, totalPrice, stepNum, stepPrice, nil + //遍历里面没有则返回第一个 + itemPrice = stepPrice.PriceRange[0].Price + fittingPrice + return itemPrice * purchaseQuantity, itemPrice, nil } From 83dc607ec42e556e099abbfc9f3b503621949dbe Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Tue, 26 Sep 2023 15:29:33 +0800 Subject: [PATCH 04/13] =?UTF-8?q?fix:=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/repositories/order.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/service/repositories/order.go b/service/repositories/order.go index 0635c3b9..8d2cabda 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -343,8 +343,14 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess Utime: &ntime, PayTitle: &payTitle, }) + var sql string + if *orderInfo.Status == int64(constants.ORDERSTATUSUNPAIDDEPOSIT) { + sql = fmt.Sprintf(", `utime` = '%s', `pay_status` = %d, `status` = %d ", ntime, orderPayStatusCode, statusCode) + } else { + sql = fmt.Sprintf(", `utime` = '%s', `pay_status` = %d", ntime, orderPayStatusCode) + } + // 更新订单信息 - var sql string = fmt.Sprintf(", `utime` = '%s', `pay_status` = %d", ntime, orderPayStatusCode) uOrderDetail["order_info"] = struct { Utime *time.Time `json:"utime"` Status gmodel.OrderStatus `json:"status"` From f20b4fad3e4bd7f5215b3e6b89baa96e65e73bf1 Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Tue, 26 Sep 2023 16:16:58 +0800 Subject: [PATCH 05/13] =?UTF-8?q?fix:=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/gmodel/fs_order_logic.go | 1 - model/gmodel/fs_shopping_cart_logic.go | 1 - model/gmodel/fs_user_gen.go | 2 +- service/repositories/order.go | 45 ++++---------------------- 4 files changed, 8 insertions(+), 41 deletions(-) diff --git a/model/gmodel/fs_order_logic.go b/model/gmodel/fs_order_logic.go index fcd0aee1..b068a734 100644 --- a/model/gmodel/fs_order_logic.go +++ b/model/gmodel/fs_order_logic.go @@ -109,7 +109,6 @@ type OrderProduct struct { DiyInformation *UserDiyInformation `json:"diy_information"` SizeInfo *OrderProductSizeInfo `json:"size_info"` FittingInfo *OrderProductFittingInfo `json:"fitting_info"` - StepNum []int `json:"step_num"` // 阶梯数量 IsHighlyCustomized int64 `json:"is_highly_customized"` } type PurchaseQuantity struct { diff --git a/model/gmodel/fs_shopping_cart_logic.go b/model/gmodel/fs_shopping_cart_logic.go index 782bab82..9df6ccf0 100644 --- a/model/gmodel/fs_shopping_cart_logic.go +++ b/model/gmodel/fs_shopping_cart_logic.go @@ -13,7 +13,6 @@ func (m *FsShoppingCartModel) TableName() string { type RelaFsShoppingCart struct { FsShoppingCart ShoppingCartProduct *RelaFsProduct `json:"shopping_cart_product" gorm:"foreignkey:product_id;references:id"` - ShoppingCartProductPriceList []*FsProductPrice `json:"shopping_cart_product_price_list" gorm:"foreignkey:product_id;references:product_id"` ShoppingCartProductModel3dList []*FsProductModel3d `json:"shopping_cart_product_model3d_list" gorm:"foreignkey:product_id;references:product_id"` ShoppingCartProductModel3dFitting *FsProductModel3d `json:"shopping_cart_product_model3d_list_fitting" gorm:"foreignkey:fitting_id;references:id"` } diff --git a/model/gmodel/fs_user_gen.go b/model/gmodel/fs_user_gen.go index 75f1e5a1..b3166fb2 100644 --- a/model/gmodel/fs_user_gen.go +++ b/model/gmodel/fs_user_gen.go @@ -14,7 +14,7 @@ type FsUser struct { LastName *string `gorm:"default:'';" json:"last_name"` // LastName Username *string `gorm:"index;default:'';" json:"username"` // Company *string `gorm:"default:'';" json:"company"` // 公司名称 - Mobile *string `gorm:"default:'';" json:"mobile"` // 手机号码 + Mobile *string `gorm:"default:'';" json:"mobile"` // PasswordHash *string `gorm:"default:'';" json:"password_hash"` // VerificationToken *string `gorm:"default:'';" json:"verification_token"` // PasswordResetToken *string `gorm:"default:'';" json:"password_reset_token"` // diff --git a/service/repositories/order.go b/service/repositories/order.go index 8d2cabda..7bdf1d4d 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -745,7 +745,7 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe resShoppingCartFind := tx.Table(gmodel.NewFsShoppingCartModel(tx).TableName()). Preload("ShoppingCartProduct", func(dbPreload *gorm.DB) *gorm.DB { return dbPreload.Table(gmodel.NewFsProductModel(tx).TableName()).Preload("CoverResource") - }).Preload("ShoppingCartProductPriceList"). + }). Preload("ShoppingCartProductModel3dList"). Preload("ShoppingCartProductModel3dFitting"). Where("id IN ?", in.CartIds). @@ -807,8 +807,7 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe for _, shoppingCart := range shoppingCartList { // 购物车快照 var shoppingCartSnapshot gmodel.CartSnapshot - // 购物车商品价格 - var shoppingCartProductPrice *gmodel.FsProductPrice + // 购物车商品模型 var shoppingCartProductModel3d *gmodel.FsProductModel3d if shoppingCart.Snapshot != nil { @@ -820,27 +819,6 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe errorCode.Message = "create order failed, product '" + shoppingCartSnapshot.ProductInfo.ProductName + "'is absent" return errors.New(errorCode.Message) } - // 商品价格异常 - if len(shoppingCart.ShoppingCartProductPriceList) == 0 { - errorCode = *basic.CodeErrOrderCreatProductPriceAbsent - errorCode.Message = "create order failed, price of product '" + shoppingCartSnapshot.ProductInfo.ProductName + "'is absent" - return errors.New(errorCode.Message) - } else { - var isProductPrice bool - for _, shoppingCartProductPriceInfo := range shoppingCart.ShoppingCartProductPriceList { - if *shoppingCart.SizeId == *shoppingCartProductPriceInfo.SizeId { - shoppingCartProductPrice = shoppingCartProductPriceInfo - isProductPrice = true - break - } - } - if !isProductPrice { - errorCode = *basic.CodeErrOrderCreatProductPriceAbsent - errorCode.Message = "create order failed, price of product '" + shoppingCartSnapshot.ProductInfo.ProductName + "'is absent" - return errors.New(errorCode.Message) - } - shoppingCart.ShoppingCartProductPriceList = []*gmodel.FsProductPrice{shoppingCartProductPrice} - } // 商品模型异常 if len(shoppingCart.ShoppingCartProductModel3dList) == 0 { @@ -864,25 +842,17 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe shoppingCart.ShoppingCartProductModel3dList = []*gmodel.FsProductModel3d{shoppingCartProductModel3d} } - var stepNum []int - var stepPrice []int - if *shoppingCartProductPrice.StepNum == "" { - errorCode = *basic.CodeErrOrderCreatProductPriceAbsent - errorCode.Message = "create order failed, step num of product '" + shoppingCartSnapshot.ProductInfo.ProductName + "'is failed" - return errors.New(errorCode.Message) + var stepPriceJson gmodel.StepPriceJsonStruct + if shoppingCartProductModel3d.StepPrice != nil { + json.Unmarshal(*shoppingCartProductModel3d.StepPrice, &shoppingCartProductModel3d.StepPrice) } else { - json.Unmarshal([]byte(*shoppingCartProductPrice.StepNum), &stepNum) - } - if *shoppingCartProductPrice.StepPrice == "" { errorCode = *basic.CodeErrOrderCreatProductPriceAbsent errorCode.Message = "create order failed, step price of product '" + shoppingCartSnapshot.ProductInfo.ProductName + "'is failed" - return errors.New(errorCode.Message) - } else { - json.Unmarshal([]byte(*shoppingCartProductPrice.StepPrice), &stepPrice) + return err } /* 计算价格 */ - productPrice, productTotalPrice, stepNum, stepPrice, err := NewShoppingCart(tx, nil, nil).CaculateCartPrice(*shoppingCart.PurchaseQuantity, shoppingCartProductPrice, *shoppingCart.ShoppingCartProductModel3dFitting.Price) + productPrice, productTotalPrice, err := NewShoppingCart(tx, nil, nil).CaculateStepPrice(*shoppingCart.PurchaseQuantity, stepPriceJson, *shoppingCart.ShoppingCartProductModel3dFitting.Price) if err != nil { errorCode = *basic.CodeErrOrderCreatProductPriceAbsent errorCode.Message = "create order failed, step price of product '" + shoppingCartSnapshot.ProductInfo.ProductName + "'is failed" @@ -960,7 +930,6 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe Cm: shoppingCartSnapshot.SizeInfo.Cm, }, }, - StepNum: stepNum, IsHighlyCustomized: *shoppingCart.IsHighlyCustomized, } orderProductList = append(orderProductList, productInter) From 42bd585fe94c4102316a13467a0c49988544f890 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Tue, 26 Sep 2023 16:20:53 +0800 Subject: [PATCH 06/13] fix --- server/shopping-cart/internal/logic/calculatecartpricelogic.go | 2 +- server/shopping-cart/internal/logic/getcartslogic.go | 2 +- service/repositories/order.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/shopping-cart/internal/logic/calculatecartpricelogic.go b/server/shopping-cart/internal/logic/calculatecartpricelogic.go index 0317398e..8a9c7a8b 100644 --- a/server/shopping-cart/internal/logic/calculatecartpricelogic.go +++ b/server/shopping-cart/internal/logic/calculatecartpricelogic.go @@ -117,7 +117,7 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri } } //计算价格 - itemPrice, totalPrice, err := l.svcCtx.Repositories.NewShoppingCart.CaculateStepPrice(reqPurchaseQuantity, stepPrice, fittingPrice) + totalPrice, itemPrice, err := l.svcCtx.Repositories.NewShoppingCart.CaculateStepPrice(reqPurchaseQuantity, stepPrice, fittingPrice) if err != nil { return err } diff --git a/server/shopping-cart/internal/logic/getcartslogic.go b/server/shopping-cart/internal/logic/getcartslogic.go index f73025a8..f715bab3 100644 --- a/server/shopping-cart/internal/logic/getcartslogic.go +++ b/server/shopping-cart/internal/logic/getcartslogic.go @@ -124,7 +124,7 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo } } //计算阶梯价格 - itemPrice, totalPrice, err := l.svcCtx.Repositories.NewShoppingCart.CaculateStepPrice(*cart.PurchaseQuantity, stepPrice, fittingPrice) + totalPrice, itemPrice, err := l.svcCtx.Repositories.NewShoppingCart.CaculateStepPrice(*cart.PurchaseQuantity, stepPrice, fittingPrice) if err != nil { logx.Error(err) return resp.SetStatusWithMessage(basic.CodeServiceErr, err.Error()) diff --git a/service/repositories/order.go b/service/repositories/order.go index 7bdf1d4d..bb03aaca 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -852,7 +852,7 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe } /* 计算价格 */ - productPrice, productTotalPrice, err := NewShoppingCart(tx, nil, nil).CaculateStepPrice(*shoppingCart.PurchaseQuantity, stepPriceJson, *shoppingCart.ShoppingCartProductModel3dFitting.Price) + productTotalPrice, productPrice, err := NewShoppingCart(tx, nil, nil).CaculateStepPrice(*shoppingCart.PurchaseQuantity, stepPriceJson, *shoppingCart.ShoppingCartProductModel3dFitting.Price) if err != nil { errorCode = *basic.CodeErrOrderCreatProductPriceAbsent errorCode.Message = "create order failed, step price of product '" + shoppingCartSnapshot.ProductInfo.ProductName + "'is failed" From 6e9f47ff856398c7111ad485cc7f68f96778ff32 Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Tue, 26 Sep 2023 16:30:51 +0800 Subject: [PATCH 07/13] =?UTF-8?q?fix:=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/repositories/order.go | 7 +++++-- utils/basic/basic.go | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/service/repositories/order.go b/service/repositories/order.go index bb03aaca..70882116 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -844,11 +844,14 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe var stepPriceJson gmodel.StepPriceJsonStruct if shoppingCartProductModel3d.StepPrice != nil { - json.Unmarshal(*shoppingCartProductModel3d.StepPrice, &shoppingCartProductModel3d.StepPrice) + err = json.Unmarshal(*shoppingCartProductModel3d.StepPrice, &shoppingCartProductModel3d.StepPrice) + if err != nil { + return err + } } else { errorCode = *basic.CodeErrOrderCreatProductPriceAbsent errorCode.Message = "create order failed, step price of product '" + shoppingCartSnapshot.ProductInfo.ProductName + "'is failed" - return err + return errors.New("shoppingCartProductModel3d.StepPrice nil") } /* 计算价格 */ diff --git a/utils/basic/basic.go b/utils/basic/basic.go index b3ecd3a7..73222e45 100644 --- a/utils/basic/basic.go +++ b/utils/basic/basic.go @@ -107,7 +107,7 @@ var ( CodeErrOrderCreatProductPriceAbsent = &StatusResponse{5304, "create order failed, price of product is absent"} // 订单创建失败，商品价格不存在 CodeErrOrderCreatProductAccessoryAbsent = &StatusResponse{5305, "create order failed, accessory of product is absent"} // 订单创建失败，商品配件不存在 CodeErrOrderCreatePrePaymentParam = &StatusResponse{5306, "create payment failed, the shipping address is illegal"} // 订单创建失败，商品配件不存在 - CodeErrOrderCreatePrePaymentInfoNoFound = &StatusResponse{5307, "create payment failed, order info not found"} + CodeErrOrderCreatePrePaymentInfoNoFound = &StatusResponse{5307, "order info not found"} CodeErrOrderCreatePrePaymentNoUnPaid = &StatusResponse{5308, "create payment failed, order is not unpaid"} CodeErrOrderCreatePrePaymentPaid = &StatusResponse{5309, "create payment failed, order is paid"} CodeErrOrderCreatePrePaymentTimeout = &StatusResponse{5310, "create payment failed, timeout"} From d07350969feea3c568c848ea4789f54093a564d1 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Tue, 26 Sep 2023 16:36:35 +0800 Subject: [PATCH 08/13] fix --- server/product/internal/config/config.go | 18 +++++++ .../logic/calculateproductpricelogic.go | 11 +++-- server/product/internal/svc/servicecontext.go | 26 ++++++++-- .../internal/logic/calculatecartpricelogic.go | 7 ++- .../internal/logic/getcartslogic.go | 8 +-- service/repositories/order.go | 2 +- utils/step_price/price.go | 49 ------------------- 7 files changed, 56 insertions(+), 65 deletions(-) diff --git a/server/product/internal/config/config.go b/server/product/internal/config/config.go index 31e07893..acda3411 100644 --- a/server/product/internal/config/config.go +++ b/server/product/internal/config/config.go @@ -11,4 +11,22 @@ type Config struct { SourceMysql string Auth types.Auth ReplicaId uint64 + AWS struct { + S3 struct { + Credentials struct { + AccessKeyID string + Secret string + Token string + } + } + } + BLMService struct { + Url string + LogoCombine struct { + Url string + } + } + Unity struct { + Host string + } } diff --git a/server/product/internal/logic/calculateproductpricelogic.go b/server/product/internal/logic/calculateproductpricelogic.go index 0e0e3309..22bb653a 100644 --- a/server/product/internal/logic/calculateproductpricelogic.go +++ b/server/product/internal/logic/calculateproductpricelogic.go @@ -8,7 +8,6 @@ import ( "fusenapi/utils/auth" "fusenapi/utils/basic" "fusenapi/utils/format" - "fusenapi/utils/step_price" "gorm.io/gorm" "context" @@ -65,9 +64,11 @@ func (l *CalculateProductPriceLogic) CalculateProductPrice(req *types.CalculateP return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get model info") } var stepPrice gmodel.StepPriceJsonStruct - if err = json.Unmarshal(*modelInfo.StepPrice, &stepPrice); err != nil { - logx.Error(err) - return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse step price") + if modelInfo.StepPrice != nil && len(*modelInfo.StepPrice) != 0 { + if err = json.Unmarshal(*modelInfo.StepPrice, &stepPrice); err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse step price") + } } //配件 fittingPrice := int64(0) @@ -82,7 +83,7 @@ func (l *CalculateProductPriceLogic) CalculateProductPrice(req *types.CalculateP } fittingPrice = *fittingInfo.Price } - totalPrice, itemPrice, err := step_price.GetNewCentStepPrice(req.PurchaseQuantity, stepPrice, fittingPrice) + totalPrice, itemPrice, err := l.svcCtx.Repositories.NewShoppingCart.CaculateStepPrice(req.PurchaseQuantity, stepPrice, fittingPrice) if err != nil { logx.Error(err) return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to calculate product price ") diff --git a/server/product/internal/svc/servicecontext.go b/server/product/internal/svc/servicecontext.go index 9f2456cf..5fa8539d 100644 --- a/server/product/internal/svc/servicecontext.go +++ b/server/product/internal/svc/servicecontext.go @@ -5,6 +5,9 @@ import ( "fmt" "fusenapi/server/product/internal/config" "fusenapi/shared" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/aws/aws-sdk-go/aws/session" "net/http" "fusenapi/initalize" @@ -18,15 +21,28 @@ type ServiceContext struct { Config config.Config SharedState *shared.SharedState - MysqlConn *gorm.DB - AllModels *gmodel.AllModelsGen + MysqlConn *gorm.DB + AllModels *gmodel.AllModelsGen + Repositories *initalize.Repositories + AwsSession *session.Session } func NewServiceContext(c config.Config) *ServiceContext { + conn := initalize.InitMysql(c.SourceMysql) + config := aws.Config{ + Credentials: credentials.NewStaticCredentials(c.AWS.S3.Credentials.AccessKeyID, c.AWS.S3.Credentials.Secret, c.AWS.S3.Credentials.Token), + } + return &ServiceContext{ - Config: c, - MysqlConn: initalize.InitMysql(c.SourceMysql), - AllModels: gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)), + Config: c, + MysqlConn: initalize.InitMysql(c.SourceMysql), + AllModels: gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)), + AwsSession: session.Must(session.NewSession(&config)), + Repositories: initalize.NewAllRepositories(&initalize.NewAllRepositorieData{ + GormDB: conn, + BLMServiceUrl: &c.BLMService.Url, + AwsSession: session.Must(session.NewSession(&config)), + }), } } diff --git a/server/shopping-cart/internal/logic/calculatecartpricelogic.go b/server/shopping-cart/internal/logic/calculatecartpricelogic.go index 8a9c7a8b..0f03bbb7 100644 --- a/server/shopping-cart/internal/logic/calculatecartpricelogic.go +++ b/server/shopping-cart/internal/logic/calculatecartpricelogic.go @@ -98,8 +98,11 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri return err } var stepPrice gmodel.StepPriceJsonStruct - if err = json.Unmarshal(*modelInfo.StepPrice, &stepPrice); err != nil { - return err + if modelInfo.StepPrice != nil && len(*modelInfo.StepPrice) != 0 { + if err = json.Unmarshal(*modelInfo.StepPrice, &stepPrice); err != nil { + logx.Error(err) + return err + } } //请求的数量 reqPurchaseQuantity := mapCalculateQuantity[cart.Id].PurchaseQuantity diff --git a/server/shopping-cart/internal/logic/getcartslogic.go b/server/shopping-cart/internal/logic/getcartslogic.go index f715bab3..8240ba5c 100644 --- a/server/shopping-cart/internal/logic/getcartslogic.go +++ b/server/shopping-cart/internal/logic/getcartslogic.go @@ -104,9 +104,11 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("the size`s model info is not exists:%d_%d", *cart.ProductId, *cart.SizeId)) } var stepPrice gmodel.StepPriceJsonStruct - if err = json.Unmarshal(*modelInfo.StepPrice, &stepPrice); err != nil { - logx.Error(err) - return resp.SetStatusWithMessage(basic.CodeJsonErr, fmt.Sprintf("failed to parse model step price:%d", *cart.ModelId)) + if modelInfo.StepPrice != nil && len(*modelInfo.StepPrice) != 0 { + if err = json.Unmarshal(*modelInfo.StepPrice, &stepPrice); err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeJsonErr, fmt.Sprintf("failed to parse model step price:%d", *cart.ModelId)) + } } //购买数量步进量 stepPurchaseQuantity := *modelInfo.PackedUnit diff --git a/service/repositories/order.go b/service/repositories/order.go index bb03aaca..de1c373e 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -843,7 +843,7 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe } var stepPriceJson gmodel.StepPriceJsonStruct - if shoppingCartProductModel3d.StepPrice != nil { + if shoppingCartProductModel3d.StepPrice != nil && len(*shoppingCartProductModel3d.StepPrice) != 0 { json.Unmarshal(*shoppingCartProductModel3d.StepPrice, &shoppingCartProductModel3d.StepPrice) } else { errorCode = *basic.CodeErrOrderCreatProductPriceAbsent diff --git a/utils/step_price/price.go b/utils/step_price/price.go index 8230f39f..79b7047d 100644 --- a/utils/step_price/price.go +++ b/utils/step_price/price.go @@ -1,10 +1,5 @@ package step_price -import ( - "errors" - "fusenapi/model/gmodel" -) - // 旧的返回厘（即将废弃） func GetCentStepPrice(minBuyNum int, stepNum []int, stepPrice []int) int64 { if minBuyNum > stepNum[len(stepNum)-1] { @@ -20,47 +15,3 @@ func GetCentStepPrice(minBuyNum int, stepNum []int, stepPrice []int) int64 { } return int64(stepPrice[len(stepPrice)-1]) } - -// 新的阶梯价格(返回美元) -func GetNewStepPrice(purchaseQuantity int64, stepPrice gmodel.StepPriceJsonStruct, fittingPrice int64) (totalPrice, itemPrice float64, err error) { - l := len(stepPrice.PriceRange) - if l == 0 { - return 0, 0, errors.New("price range is not set") - } - //遍历查询合适的价格 - for k, v := range stepPrice.PriceRange { - //购买数量>起点 - if purchaseQuantity > v.StartQuantity { - //最后一个 || 小于等于终点 - if k == l-1 || purchaseQuantity <= v.EndQuantity { - itemPrice = float64(v.Price+fittingPrice) / 1000 - return itemPrice * float64(purchaseQuantity), itemPrice / 1000, nil - } - } - } - //遍历里面没有则返回第一个 - itemPrice = float64(stepPrice.PriceRange[0].Price+fittingPrice) / 1000 - return itemPrice * float64(purchaseQuantity), itemPrice, nil -} - -// 新的阶梯价格(返回厘) -func GetNewCentStepPrice(purchaseQuantity int64, stepPrice gmodel.StepPriceJsonStruct, fittingPrice int64) (totalPrice, itemPrice int64, err error) { - l := len(stepPrice.PriceRange) - if l == 0 { - return 0, 0, errors.New("price range is not set") - } - //遍历查询合适的价格 - for k, v := range stepPrice.PriceRange { - //购买数量>起点 - if purchaseQuantity > v.StartQuantity { - //最后一个 || 小于等于终点 - if k == l-1 || purchaseQuantity <= v.EndQuantity { - itemPrice = v.Price + fittingPrice - return itemPrice * purchaseQuantity, itemPrice, nil - } - } - } - //遍历里面没有则返回第一个 - itemPrice = stepPrice.PriceRange[0].Price + fittingPrice - return itemPrice * purchaseQuantity, itemPrice, nil -} From 9e6f919fa8bb70656d5b7c82e3354f80d897517b Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Tue, 26 Sep 2023 16:53:34 +0800 Subject: [PATCH 09/13] =?UTF-8?q?fix:=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/gmodel/fs_shopping_cart_logic.go | 6 ++--- service/repositories/order.go | 31 +++----------------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/model/gmodel/fs_shopping_cart_logic.go b/model/gmodel/fs_shopping_cart_logic.go index 9df6ccf0..21f020a8 100644 --- a/model/gmodel/fs_shopping_cart_logic.go +++ b/model/gmodel/fs_shopping_cart_logic.go @@ -12,9 +12,9 @@ func (m *FsShoppingCartModel) TableName() string { // 关联查询 type RelaFsShoppingCart struct { FsShoppingCart - ShoppingCartProduct *RelaFsProduct `json:"shopping_cart_product" gorm:"foreignkey:product_id;references:id"` - ShoppingCartProductModel3dList []*FsProductModel3d `json:"shopping_cart_product_model3d_list" gorm:"foreignkey:product_id;references:product_id"` - ShoppingCartProductModel3dFitting *FsProductModel3d `json:"shopping_cart_product_model3d_list_fitting" gorm:"foreignkey:fitting_id;references:id"` + ShoppingCartProduct *RelaFsProduct `json:"shopping_cart_product" gorm:"foreignkey:product_id;references:id"` + ShoppingCartProductModel3d *FsProductModel3d `json:"shopping_cart_product_model3d_list" gorm:"foreignkey:model_id;references:id"` + ShoppingCartProductModel3dFitting *FsProductModel3d `json:"shopping_cart_product_model3d_list_fitting" gorm:"foreignkey:fitting_id;references:id"` } type FsShoppingCartData struct { Id int64 `gorm:"primary_key;default:0;auto_increment;" json:"id"` // id diff --git a/service/repositories/order.go b/service/repositories/order.go index cfcfe27b..e3d1e4c7 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -746,7 +746,7 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe Preload("ShoppingCartProduct", func(dbPreload *gorm.DB) *gorm.DB { return dbPreload.Table(gmodel.NewFsProductModel(tx).TableName()).Preload("CoverResource") }). - Preload("ShoppingCartProductModel3dList"). + Preload("ShoppingCartProductModel3d"). Preload("ShoppingCartProductModel3dFitting"). Where("id IN ?", in.CartIds). Where("user_id = ?", in.UserId). @@ -807,9 +807,6 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe for _, shoppingCart := range shoppingCartList { // 购物车快照 var shoppingCartSnapshot gmodel.CartSnapshot - - // 购物车商品模型 - var shoppingCartProductModel3d *gmodel.FsProductModel3d if shoppingCart.Snapshot != nil { json.Unmarshal([]byte(*shoppingCart.Snapshot), &shoppingCartSnapshot) } @@ -820,31 +817,9 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe return errors.New(errorCode.Message) } - // 商品模型异常 - if len(shoppingCart.ShoppingCartProductModel3dList) == 0 { - errorCode = *basic.CodeErrOrderCreatProductAccessoryAbsent - errorCode.Message = "create order failed, accessoryof product '" + shoppingCartSnapshot.ProductInfo.ProductName + "'is absent" - return errors.New(errorCode.Message) - } else { - var isProductModel bool - for _, shoppingCartProductModel3dInfo := range shoppingCart.ShoppingCartProductModel3dList { - if *shoppingCart.SizeId == *shoppingCartProductModel3dInfo.SizeId { - shoppingCartProductModel3d = shoppingCartProductModel3dInfo - isProductModel = true - break - } - } - if !isProductModel { - errorCode = *basic.CodeErrOrderCreatProductAccessoryAbsent - errorCode.Message = "create order failed, accessory of product '" + shoppingCartSnapshot.ProductInfo.ProductName + "'is absent" - return errors.New(errorCode.Message) - } - shoppingCart.ShoppingCartProductModel3dList = []*gmodel.FsProductModel3d{shoppingCartProductModel3d} - } - var stepPriceJson gmodel.StepPriceJsonStruct - if shoppingCartProductModel3d.StepPrice != nil && len(*shoppingCartProductModel3d.StepPrice) != 0 { - err = json.Unmarshal(*shoppingCartProductModel3d.StepPrice, &shoppingCartProductModel3d.StepPrice) + if shoppingCart.ShoppingCartProductModel3d.StepPrice != nil { + err = json.Unmarshal(*shoppingCart.ShoppingCartProductModel3d.StepPrice, &stepPriceJson) if err != nil { return err } From 76f4a682acbe4acd8d1ffceeca83db15247019c4 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Tue, 26 Sep 2023 17:01:31 +0800 Subject: [PATCH 10/13] fix --- server/shopping-cart/internal/logic/getcartslogic.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/shopping-cart/internal/logic/getcartslogic.go b/server/shopping-cart/internal/logic/getcartslogic.go index 8240ba5c..973b5c6a 100644 --- a/server/shopping-cart/internal/logic/getcartslogic.go +++ b/server/shopping-cart/internal/logic/getcartslogic.go @@ -155,6 +155,10 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo productCoverMetadata = metadata } } + templateTag := "" + if templateInfo, ok := mapTemplate[*cart.TemplateId]; ok { + templateTag = *templateInfo.TemplateTag + } item := types.CartItem{ CartId: cart.Id, ProductInfo: types.ProductInfo{ @@ -190,7 +194,7 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo StepPurchaseQuantity: stepPurchaseQuantity, IsHighlyCustomized: *cart.IsHighlyCustomized > 0, IsSelected: *cart.IsSelected > 0, - TemplateTag: *mapTemplate[*cart.TemplateId].TemplateTag, + TemplateTag: templateTag, Logo: snapShot.Logo, } //是否有失效的 From 44fd4f03e3b61adfd550cd458e992164eb49a2ea Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Tue, 26 Sep 2023 17:04:27 +0800 Subject: [PATCH 11/13] =?UTF-8?q?fix:=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/repositories/order.go | 1 + utils/order/order.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/service/repositories/order.go b/service/repositories/order.go index e3d1e4c7..de3a9001 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -351,6 +351,7 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess } // 更新订单信息 + uOrderDetail["pay_status"] = orderPayStatusCode uOrderDetail["order_info"] = struct { Utime *time.Time `json:"utime"` Status gmodel.OrderStatus `json:"status"` diff --git a/utils/order/order.go b/utils/order/order.go index 5337531b..0036ad7c 100644 --- a/utils/order/order.go +++ b/utils/order/order.go @@ -166,6 +166,9 @@ func UpdateOrderStatusLink(statusLink []gmodel.OrderStatus, status gmodel.OrderS if status.Utime != nil { item.Utime = status.Utime } + if status.Ctime != nil { + item.Ctime = status.Ctime + } if status.Metadata != nil { item.Metadata = status.Metadata } From 15888a953b294490832ba79cae2630f3a88ce843 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Tue, 26 Sep 2023 17:08:49 +0800 Subject: [PATCH 12/13] fix --- server/shopping-cart/internal/logic/calculatecartpricelogic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/shopping-cart/internal/logic/calculatecartpricelogic.go b/server/shopping-cart/internal/logic/calculatecartpricelogic.go index 0f03bbb7..826728c2 100644 --- a/server/shopping-cart/internal/logic/calculatecartpricelogic.go +++ b/server/shopping-cart/internal/logic/calculatecartpricelogic.go @@ -53,7 +53,7 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri //获取购物车列表 carts, _, err := l.svcCtx.AllModels.FsShoppingCart.GetAllCartsByParam(l.ctx, gmodel.GetAllCartsByParamReq{ Ids: cartIds, - Fields: "id,size_id,product_id,fitting_id", + Fields: "id,size_id,product_id,fitting_id,model_id", UserId: userinfo.UserId, Page: 1, Limit: len(cartIds), From ad01dbc0e5216348bf5b1157e594e71445d6d9dd Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Tue, 26 Sep 2023 17:12:12 +0800 Subject: [PATCH 13/13] =?UTF-8?q?fix:=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/repositories/order.go | 1 + 1 file changed, 1 insertion(+) diff --git a/service/repositories/order.go b/service/repositories/order.go index de3a9001..ce793fab 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -361,6 +361,7 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess Status: status, StatusLink: statusLink, } + fmt.Printf("uOrderDetail :%+v", uOrderDetail) if len(uOrderDetail) > 0 { err = fssql.MetadataOrderPATCH(d.MysqlConn, sql, orderSn, gmodel.FsOrder{}, uOrderDetail, "id = ?", orderInfo.Id) if err != nil {