fiee/micro-bundle
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: fiee:f9510db2eb88a6f7c2058e16495312ef6385d609
Branches Tags
fiee:main
fiee:jng
fiee:dev
fiee:feat-zjy-issue-013
fiee:dev-lzh
fiee:feat-zjy-fixbug
fiee:sxy
fiee:feat-zjy-issue-008
fiee:status
fiee:sc
fiee:1.0.5
fiee:1.0.4
fiee:1.03
fiee:1.02
fiee:1.01
..
compare: fiee:fabc41aa921740290daf70a29b4c2df4be24b803
Branches Tags
fiee:jng
fiee:main
fiee:dev
fiee:feat-zjy-issue-013
fiee:dev-lzh
fiee:feat-zjy-fixbug
fiee:sxy
fiee:feat-zjy-issue-008
fiee:status
fiee:sc
fiee:1.0.5
fiee:1.0.4
fiee:1.03
fiee:1.02
fiee:1.01

No commits in common. "f9510db2eb88a6f7c2058e16495312ef6385d609" and "fabc41aa921740290daf70a29b4c2df4be24b803" have entirely different histories.
f9510db2eb ... fabc41aa92

1 changed files with 12 additions and 14 deletions
Show Stats Expand all files Collapse all files

26
internal/logic/valueAddBundleLogic.go
View File

@ -362,9 +362,9 @@ func ValueAddServiceList(req *bundle.ValueAddServiceListRequest) (res *bundle.Va
num := decimal.NewFromInt(int64(option.Num)) num := decimal.NewFromInt(int64(option.Num))
saveAmount = original.Sub(price).Mul(num) saveAmount = original.Sub(price).Mul(num)
} else if serviceLang.PriceMode == 2 { } else if serviceLang.PriceMode == 2 {
//original := decimal.NewFromFloat(float64(serviceLang.OriginalPrice)) original := decimal.NewFromFloat(float64(serviceLang.OriginalPrice))
//price := decimal.NewFromFloat(float64(option.Price)) price := decimal.NewFromFloat(float64(option.Price))
saveAmount = decimal.NewFromInt(int64(0)) saveAmount = original.Sub(price)
} }
options = append(options, &bundle.ValueAddPriceOptions{ options = append(options, &bundle.ValueAddPriceOptions{
Id: int64(option.Id), Id: int64(option.Id),
@ -417,10 +417,9 @@ func ValueAddServiceDetail(req *bundle.ValueAddServiceDetailRequest) (res *bundl
num := decimal.NewFromInt(int64(opt.Num)) num := decimal.NewFromInt(int64(opt.Num))
saveAmount = original.Sub(price).Mul(num) saveAmount = original.Sub(price).Mul(num)
} else if serviceLang.PriceMode == 2 { } else if serviceLang.PriceMode == 2 {
//original := decimal.NewFromFloat(float64(serviceLang.OriginalPrice)) original := decimal.NewFromFloat(float64(serviceLang.OriginalPrice))
//price := decimal.NewFromFloat(float64(opt.Price)) price := decimal.NewFromFloat(float64(opt.Price))
saveAmount = decimal.NewFromInt(int64(0)) saveAmount = original.Sub(price)
} }
langOptions = append(langOptions, &bundle.ValueAddPriceOptions{ langOptions = append(langOptions, &bundle.ValueAddPriceOptions{
Id: int64(opt.Id), Id: int64(opt.Id),
@ -498,10 +497,9 @@ func ValueAddServiceDetailByUuidAndLanguage(req *bundle.ValueAddServiceDetailReq
num := decimal.NewFromInt(int64(opt.Num)) num := decimal.NewFromInt(int64(opt.Num))
saveAmount = original.Sub(price).Mul(num) saveAmount = original.Sub(price).Mul(num)
} else if detail.PriceMode == 2 { } else if detail.PriceMode == 2 {
//original := decimal.NewFromFloat(float64(detail.OriginalPrice)) original := decimal.NewFromFloat(float64(detail.OriginalPrice))
//price := decimal.NewFromFloat(float64(opt.Price)) price := decimal.NewFromFloat(float64(opt.Price))
saveAmount = decimal.NewFromInt(int64(0)) saveAmount = original.Sub(price)
} }
langOptions = append(langOptions, &bundle.ValueAddPriceOptions{ langOptions = append(langOptions, &bundle.ValueAddPriceOptions{
Id: int64(opt.Id), Id: int64(opt.Id),
@ -583,9 +581,9 @@ func BatchGetValueAddServiceLang(req *bundle.BatchGetValueAddServiceLangRequest)
num := decimal.NewFromInt(int64(opt.Num)) num := decimal.NewFromInt(int64(opt.Num))
saveAmount = original.Sub(price).Mul(num) saveAmount = original.Sub(price).Mul(num)
} else if v.PriceMode == 2 { } else if v.PriceMode == 2 {
//original := decimal.NewFromFloat(float64(v.OriginalPrice)) original := decimal.NewFromFloat(float64(v.OriginalPrice))
//price := decimal.NewFromFloat(float64(opt.Price)) price := decimal.NewFromFloat(float64(opt.Price))
saveAmount = decimal.NewFromInt(int64(0)) saveAmount = original.Sub(price)
} }
langOptions = append(langOptions, &bundle.ValueAddPriceOptions{ langOptions = append(langOptions, &bundle.ValueAddPriceOptions{
Id: int64(opt.Id), Id: int64(opt.Id),