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-09-27 16:01:22 +08:00
parent 9e2526405f
commit b6d4d06c25
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,13 +91,17 @@ func (l *GetProductStepPriceLogic) GetProductStepPrice(req *types.GetProductStep
stepPurchaseQuantity := *modelPriceInfo.PackedUnit stepPurchaseQuantity := *modelPriceInfo.PackedUnit
//购买数步进基数描述 //购买数步进基数描述
stepPurchaseQuantityDescription := "主体装箱数为步进基数" stepPurchaseQuantityDescription := "主体装箱数为步进基数"
//配件价格
fittingPrice := int64(0)
if *modelPriceInfo.PartId > 0 { if *modelPriceInfo.PartId > 0 {
fittingPriceInfo, ok := mapFitting[*modelPriceInfo.PartId] fittingPriceInfo, ok := mapFitting[*modelPriceInfo.PartId]
if !ok { if !ok {
return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("fitting price is not exists:%d", *modelPriceInfo.PartId)) return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("fitting price is not exists:%d", *modelPriceInfo.PartId))
} }
//最小价格要加配件 //最小/最大价格要加配件
minPrice += *fittingPriceInfo.Price fittingPrice = *fittingPriceInfo.Price
minPrice += fittingPrice
maxPrice += fittingPrice
//如果配件装箱基数比主体大，则基数以配件为主 //如果配件装箱基数比主体大，则基数以配件为主
if *fittingPriceInfo.PackedUnit > stepPurchaseQuantity { if *fittingPriceInfo.PackedUnit > stepPurchaseQuantity {
stepPurchaseQuantity = *fittingPriceInfo.PackedUnit stepPurchaseQuantity = *fittingPriceInfo.PackedUnit
@ -111,7 +115,7 @@ func (l *GetProductStepPriceLogic) GetProductStepPrice(req *types.GetProductStep
begin := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.StartQuantity)) begin := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.StartQuantity))
stepRange = append(stepRange, map[string]interface{}{ stepRange = append(stepRange, map[string]interface{}{
"range_description": fmt.Sprintf(">=%s Units", begin), "range_description": fmt.Sprintf(">=%s Units", begin),
"item_price": format.CentitoDollar(rangeInfo.Price, 3), "item_price": format.CentitoDollar(rangeInfo.Price+fittingPrice, 3),
}) })
break break
} }
@ -119,7 +123,7 @@ func (l *GetProductStepPriceLogic) GetProductStepPrice(req *types.GetProductStep
end := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.EndQuantity)) end := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.EndQuantity))
stepRange = append(stepRange, map[string]interface{}{ stepRange = append(stepRange, map[string]interface{}{
"range_description": fmt.Sprintf("%s-%s Units", begin, end), "range_description": fmt.Sprintf("%s-%s Units", begin, end),
"item_price": format.CentitoDollar(rangeInfo.Price, 3), "item_price": format.CentitoDollar(rangeInfo.Price+fittingPrice, 3),
}) })
} }
mapRsp[fmt.Sprintf("_%d", *modelPriceInfo.SizeId)] = map[string]interface{}{ mapRsp[fmt.Sprintf("_%d", *modelPriceInfo.SizeId)] = map[string]interface{}{

3
utils/format/number.go
View File

@ -8,11 +8,12 @@ import (
// 数字变成带千分位的字符串 // 数字变成带千分位的字符串
func NumToStringWithThousandthPercentile(numberStr string) string { func NumToStringWithThousandthPercentile(numberStr string) string {
numberStr = strings.TrimLeft(numberStr, "0") //去掉左边开始的0
if _, err := strconv.ParseFloat(numberStr, 64); err != nil { if _, err := strconv.ParseFloat(numberStr, 64); err != nil {
log.Fatalln("is not a number") log.Fatalln("is not a number")
return "" return ""
} }
sliceList := strings.Split(numberStr, ".") sliceList := strings.Split(numberStr, ".") //切分开小数
s := sliceList[0] s := sliceList[0]
f := "" f := ""
if len(sliceList) == 2 { if len(sliceList) == 2 {