fix
This commit is contained in:
parent
4e13550044
commit
eb25e5bfcc
|
@ -3,6 +3,7 @@ package logic
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"fusenapi/model/gmodel"
|
||||||
"fusenapi/utils/auth"
|
"fusenapi/utils/auth"
|
||||||
"fusenapi/utils/basic"
|
"fusenapi/utils/basic"
|
||||||
"fusenapi/utils/format"
|
"fusenapi/utils/format"
|
||||||
|
@ -68,7 +69,6 @@ func (l *GetPriceByPidLogic) GetPriceByPid(req *types.GetPriceByPidReq, userinfo
|
||||||
return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("failed to parse step price,id = %d", priceInfo.Id))
|
return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("failed to parse step price,id = %d", priceInfo.Id))
|
||||||
}
|
}
|
||||||
lenStepNum := len(stepNumSlice)
|
lenStepNum := len(stepNumSlice)
|
||||||
lenStepPrice := len(stepPriceSlice)
|
|
||||||
itemList := make([]types.PriceItem, 0, 10)
|
itemList := make([]types.PriceItem, 0, 10)
|
||||||
for *priceInfo.MinBuyNum < (int64(stepNumSlice[lenStepNum-1]) + 5) {
|
for *priceInfo.MinBuyNum < (int64(stepNumSlice[lenStepNum-1]) + 5) {
|
||||||
itemList = append(itemList, types.PriceItem{
|
itemList = append(itemList, types.PriceItem{
|
||||||
|
@ -79,33 +79,7 @@ func (l *GetPriceByPidLogic) GetPriceByPid(req *types.GetPriceByPidReq, userinfo
|
||||||
*priceInfo.MinBuyNum++
|
*priceInfo.MinBuyNum++
|
||||||
}
|
}
|
||||||
//组装阶梯数量范围价格
|
//组装阶梯数量范围价格
|
||||||
stepListRsp := make([]types.StepPrice, 0, lenStepNum)
|
stepListRsp := l.dealWithStepRange(stepNumSlice, stepPriceSlice, priceInfo)
|
||||||
for numKey, stepNum := range stepNumSlice {
|
|
||||||
//先取最后一个
|
|
||||||
tmpPrice := float64(stepPriceSlice[lenStepPrice-1]) / 100
|
|
||||||
//如果同下标下面有价格
|
|
||||||
if numKey < lenStepPrice {
|
|
||||||
tmpPrice = float64(stepPriceSlice[numKey]) / 100
|
|
||||||
}
|
|
||||||
num := int64(stepNum) * (*priceInfo.EachBoxNum)
|
|
||||||
rangeNum := ""
|
|
||||||
if numKey < lenStepNum-1 { //前面的
|
|
||||||
nextNum := int64(stepNumSlice[numKey+1]) * (*priceInfo.EachBoxNum)
|
|
||||||
//第一个
|
|
||||||
if numKey == 0 {
|
|
||||||
rangeNum = fmt.Sprintf("%d-%dPCS", num, nextNum-1)
|
|
||||||
} else {
|
|
||||||
rangeNum = fmt.Sprintf("%d-%dPCS", num, nextNum-1)
|
|
||||||
}
|
|
||||||
} else { //最后一个
|
|
||||||
rangeNum = fmt.Sprintf(">=%dPCS", num)
|
|
||||||
}
|
|
||||||
stepListRsp = append(stepListRsp, types.StepPrice{
|
|
||||||
Range: rangeNum,
|
|
||||||
Price: tmpPrice,
|
|
||||||
})
|
|
||||||
|
|
||||||
}
|
|
||||||
//排序(必须放在其他逻辑之后)
|
//排序(必须放在其他逻辑之后)
|
||||||
sort.Ints(stepPriceSlice)
|
sort.Ints(stepPriceSlice)
|
||||||
minPrice := float64(stepPriceSlice[0]) / 100
|
minPrice := float64(stepPriceSlice[0]) / 100
|
||||||
|
@ -120,6 +94,41 @@ func (l *GetPriceByPidLogic) GetPriceByPid(req *types.GetPriceByPidReq, userinfo
|
||||||
}
|
}
|
||||||
return resp.SetStatusWithMessage(basic.CodeOK, "success", mapRsp)
|
return resp.SetStatusWithMessage(basic.CodeOK, "success", mapRsp)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 组装阶梯价格范围
|
||||||
|
func (l *GetPriceByPidLogic) dealWithStepRange(stepNumSlice, stepPriceSlice []int, priceInfo gmodel.FsProductPrice) []types.StepPrice {
|
||||||
|
lenStepNum := len(stepNumSlice)
|
||||||
|
lenStepPrice := len(stepPriceSlice)
|
||||||
|
stepListRsp := make([]types.StepPrice, 0, lenStepNum)
|
||||||
|
for numKey, stepNum := range stepNumSlice {
|
||||||
|
//先取最后一个
|
||||||
|
tmpPrice := float64(stepPriceSlice[lenStepPrice-1]) / 100
|
||||||
|
//如果同下标下面有价格
|
||||||
|
if numKey < lenStepPrice {
|
||||||
|
tmpPrice = float64(stepPriceSlice[numKey]) / 100
|
||||||
|
}
|
||||||
|
num := int64(stepNum) * (*priceInfo.EachBoxNum)
|
||||||
|
rangeNum := ""
|
||||||
|
if numKey < lenStepNum-1 { //前面的
|
||||||
|
nextNum := int64(stepNumSlice[numKey+1]) * (*priceInfo.EachBoxNum)
|
||||||
|
//第一个
|
||||||
|
if numKey == 0 {
|
||||||
|
rangeNum = fmt.Sprintf("%d-%dPCS", num, nextNum-1)
|
||||||
|
} else {
|
||||||
|
rangeNum = fmt.Sprintf("%d-%dPCS", num, nextNum-1)
|
||||||
|
}
|
||||||
|
} else { //最后一个
|
||||||
|
rangeNum = fmt.Sprintf(">=%dPCS", num)
|
||||||
|
}
|
||||||
|
stepListRsp = append(stepListRsp, types.StepPrice{
|
||||||
|
Range: rangeNum,
|
||||||
|
Price: tmpPrice,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return stepListRsp
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取mapKey
|
||||||
func (l *GetPriceByPidLogic) getSizePriceMapKey(sizeId int64) string {
|
func (l *GetPriceByPidLogic) getSizePriceMapKey(sizeId int64) string {
|
||||||
return fmt.Sprintf("_%d", sizeId)
|
return fmt.Sprintf("_%d", sizeId)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user