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

fix

Browse Source
This commit is contained in:
laodaming 2023-10-07 14:24:57 +08:00
parent 6743f4dff1
commit 87dd183279
4 changed files with 65 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server/product/internal/logic/calculateproductpricelogic.go
View File

@ -3,6 +3,7 @@ package logic
import ( import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt"
"fusenapi/constants" "fusenapi/constants"
"fusenapi/model/gmodel" "fusenapi/model/gmodel"
"fusenapi/utils/auth" "fusenapi/utils/auth"
@ -83,15 +84,38 @@ func (l *CalculateProductPriceLogic) CalculateProductPrice(req *types.CalculateP
} }
fittingPrice = *fittingInfo.Price fittingPrice = *fittingInfo.Price
} }
rangeLen := len(stepPrice.PriceRange)
stepRange := make([]interface{}, 0, rangeLen)
for rIndex, rangeInfo := range stepPrice.PriceRange {
//最后一个
if rIndex+1 == rangeLen {
begin := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.StartQuantity))
stepRange = append(stepRange, map[string]interface{}{
"start": rangeInfo.StartQuantity,
"end": rangeInfo.EndQuantity,
"range_description": fmt.Sprintf(">=%s Units", begin),
"item_price": format.CentitoDollar(rangeInfo.Price+fittingPrice, 3),
})
break
}
begin := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.StartQuantity))
end := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.EndQuantity))
stepRange = append(stepRange, map[string]interface{}{
"start": rangeInfo.StartQuantity,
"end": rangeInfo.EndQuantity,
"range_description": fmt.Sprintf("%s-%s Units", begin, end),
"item_price": format.CentitoDollar(rangeInfo.Price+fittingPrice, 3),
})
}
totalPrice, itemPrice, err := l.svcCtx.Repositories.NewShoppingCart.CaculateStepPrice(req.PurchaseQuantity, stepPrice, fittingPrice) totalPrice, itemPrice, err := l.svcCtx.Repositories.NewShoppingCart.CaculateStepPrice(req.PurchaseQuantity, stepPrice, fittingPrice)
if err != nil { if err != nil {
logx.Error(err) logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to calculate product price ") return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to calculate product price ")
} }
return resp.SetStatusWithMessage(basic.CodeOK, "success", types.CalculateProductPriceRsp{ return resp.SetStatusWithMessage(basic.CodeOK, "success", types.CalculateProductPriceRsp{
ItemPrice: format.CentitoDollar(itemPrice, 3), ItemPrice: format.CentitoDollar(itemPrice, 3),
TotalPrice: format.CentitoDollarWithNoHalfAdjust(totalPrice, 2), TotalPrice: format.CentitoDollarWithNoHalfAdjust(totalPrice, 2),
PurchaseQuantity: req.PurchaseQuantity, StepRange: stepPrice,
}) })
} }

96
server/product/internal/logic/getproductsteppricelogic.go
View File

@ -11,6 +11,7 @@ import (
"fusenapi/utils/basic" "fusenapi/utils/basic"
"fusenapi/utils/format" "fusenapi/utils/format"
"gorm.io/gorm" "gorm.io/gorm"
"strings"
"fusenapi/server/product/internal/svc" "fusenapi/server/product/internal/svc"
"fusenapi/server/product/internal/types" "fusenapi/server/product/internal/types"
@ -50,15 +51,21 @@ func (l *GetProductStepPriceLogic) GetProductStepPrice(req *types.GetProductStep
return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get product info") return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get product info")
} }
//查询产品价格 //查询产品价格
modelPriceList, err := l.svcCtx.AllModels.FsProductModel3d.GetAllByProductIdTag(l.ctx, req.ProductId, constants.TAG_MODEL, "id,size_id,part_id,step_price,packed_unit") modelPriceList, err := l.svcCtx.AllModels.FsProductModel3d.GetAllByProductIdTag(l.ctx, req.ProductId, constants.TAG_MODEL, "id,size_id,part_list,part_id,step_price,packed_unit")
if err != nil { if err != nil {
logx.Error(err) logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get model price list") return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get model price list")
} }
fittingIds := make([]int64, 0, len(modelPriceList)) fittingIds := make([]int64, 0, len(modelPriceList))
for _, v := range modelPriceList { for _, v := range modelPriceList {
if *v.PartId > 0 { *v.PartList = strings.Trim(*v.PartList, ",")
fittingIds = append(fittingIds, *v.PartId) if *v.PartList != "" {
tmpPartIds, err := format.StrSlicToInt64Slice(strings.Split(*v.PartList, ","))
if err != nil {
logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to parse model part list ")
}
fittingIds = append(fittingIds, tmpPartIds...)
} }
} }
//查询配件价格列表 //查询配件价格列表
@ -73,77 +80,38 @@ func (l *GetProductStepPriceLogic) GetProductStepPrice(req *types.GetProductStep
} }
//遍历处理模型价格 //遍历处理模型价格
mapRsp := make(map[string]interface{}) mapRsp := make(map[string]interface{})
for _, modelPriceInfo := range modelPriceList { for _, modelInfo := range modelPriceList {
var stepPrice gmodel.StepPriceJsonStruct var stepPrice gmodel.StepPriceJsonStruct
if err = json.Unmarshal(*modelPriceInfo.StepPrice, &stepPrice); err != nil { if err = json.Unmarshal(*modelInfo.StepPrice, &stepPrice); err != nil {
logx.Error(err) logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse step price json") return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse step price json")
} }
rangeLen := len(stepPrice.PriceRange) rangeLen := len(stepPrice.PriceRange)
if rangeLen == 0 { if rangeLen == 0 {
return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("step price is not set:%d", modelPriceInfo.Id)) return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("step price is not set:%d", modelInfo.Id))
} }
//最小单价 *modelInfo.PartList = strings.Trim(*modelInfo.PartList, ",")
minPrice := stepPrice.PriceRange[rangeLen-1].Price mapFittingUnit := make(map[string]interface{})
//最大单价 if *modelInfo.PartList != "" {
maxPrice := stepPrice.PriceRange[0].Price tmpPartIds, err := format.StrSlicToInt64Slice(strings.Split(*modelInfo.PartList, ","))
//购买数步进基数 if err != nil {
stepPurchaseQuantity := *modelPriceInfo.PackedUnit logx.Error(err)
//购买数步进基数描述 return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to parse model part list!! ")
stepPurchaseQuantityDescription := "主体装箱数为步进基数"
//配件价格
fittingPrice := int64(0)
if *modelPriceInfo.PartId > 0 {
fittingPriceInfo, ok := mapFitting[*modelPriceInfo.PartId]
if !ok {
return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("fitting price is not exists:%d", *modelPriceInfo.PartId))
} }
//最小/最大价格要加配件 for _, partId := range tmpPartIds {
fittingPrice = *fittingPriceInfo.Price fittingInfo, ok := mapFitting[*modelInfo.PartId]
minPrice += fittingPrice if !ok {
maxPrice += fittingPrice return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("fitting price is not exists:%d", *modelInfo.PartId))
//如果配件装箱基数比主体大，则基数以配件为主 }
if *fittingPriceInfo.PackedUnit > stepPurchaseQuantity { mapFittingUnit[fmt.Sprintf("_%d", partId)] = map[string]interface{}{
stepPurchaseQuantity = *fittingPriceInfo.PackedUnit "packed_unit": *fittingInfo.PackedUnit, //装箱个数
stepPurchaseQuantityDescription = "配件装箱数为步进基数" }
} }
} }
stepRange := make([]interface{}, 0, rangeLen) mapRsp[fmt.Sprintf("_%d", *modelInfo.SizeId)] = map[string]interface{}{
for rIndex, rangeInfo := range stepPrice.PriceRange { "min_buy_units_quantity": stepPrice.MinBuyUnitsNum, //起购数量
//最后一个 "main_packed_unit": *modelInfo.PackedUnit, //主体装箱数
if rIndex+1 == rangeLen { "fitting": mapFittingUnit,
begin := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.StartQuantity))
stepRange = append(stepRange, map[string]interface{}{
"start": rangeInfo.StartQuantity,
"end": rangeInfo.EndQuantity,
"range_description": fmt.Sprintf(">=%s Units", begin),
"item_price": format.CentitoDollar(rangeInfo.Price+fittingPrice, 3),
})
break
}
begin := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.StartQuantity))
end := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.EndQuantity))
stepRange = append(stepRange, map[string]interface{}{
"start": rangeInfo.StartQuantity,
"end": rangeInfo.EndQuantity,
"range_description": fmt.Sprintf("%s-%s Units", begin, end),
"item_price": format.CentitoDollar(rangeInfo.Price+fittingPrice, 3),
})
}
//计算起购数量的单价
_, itemPrice, err := l.svcCtx.Repositories.NewShoppingCart.CaculateStepPrice(stepPrice.MinBuyUnitsNum, stepPrice, fittingPrice)
if err != nil {
return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get min buy quantity item price")
}
mapRsp[fmt.Sprintf("_%d", *modelPriceInfo.SizeId)] = map[string]interface{}{
"step_purchase_quantity": stepPurchaseQuantity,
"step_purchase_quantity_description": stepPurchaseQuantityDescription,
"min_price": minPrice,
"max_price": maxPrice,
"step_range": stepRange,
"min_buy_units_quantity": stepPrice.MinBuyUnitsNum,
"min_buy_units_quantity_total_price": format.CentitoDollarWithNoHalfAdjust(itemPrice*stepPrice.MinBuyUnitsNum, 2),
"min_buy_units_quantity_item_price": format.CentitoDollar(itemPrice, 3),
} }
} }
return resp.SetStatusWithMessage(basic.CodeOK, "success", mapRsp) return resp.SetStatusWithMessage(basic.CodeOK, "success", mapRsp)

6
server/product/internal/types/types.go
View File

@ -343,9 +343,9 @@ type CalculateProductPriceReq struct {
} }
type CalculateProductPriceRsp struct { type CalculateProductPriceRsp struct {
ItemPrice string `json:"item_price"` ItemPrice string `json:"item_price"`
TotalPrice string `json:"total_price"` TotalPrice string `json:"total_price"`
PurchaseQuantity int64 `json:"purchase_quantity"` StepRange interface{} `json:"step_range"`
} }
type GetSizeByPidReq struct { type GetSizeByPidReq struct {

6
server_api/product.api
View File

@ -394,9 +394,9 @@ type CalculateProductPriceReq {
PurchaseQuantity int64 `json:"purchase_quantity"` PurchaseQuantity int64 `json:"purchase_quantity"`
} }
type CalculateProductPriceRsp { type CalculateProductPriceRsp {
ItemPrice string `json:"item_price"` ItemPrice string `json:"item_price"`
TotalPrice string `json:"total_price"` TotalPrice string `json:"total_price"`
PurchaseQuantity int64 `json:"purchase_quantity"` StepRange interface{} `json:"step_range"`
} }
//获取产品尺寸列表 //获取产品尺寸列表
type GetSizeByPidReq { type GetSizeByPidReq {