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

Merge branch 'sxy' into dev

Browse Source
This commit is contained in:
孙肖扬 2025-06-20 16:26:40 +08:00
commit f9510db2eb
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File 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 = original.Sub(price) saveAmount = decimal.NewFromInt(int64(0))
} }
options = append(options, &bundle.ValueAddPriceOptions{ options = append(options, &bundle.ValueAddPriceOptions{
Id: int64(option.Id), Id: int64(option.Id),
@ -417,9 +417,10 @@ 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 = original.Sub(price) saveAmount = decimal.NewFromInt(int64(0))
} }
langOptions = append(langOptions, &bundle.ValueAddPriceOptions{ langOptions = append(langOptions, &bundle.ValueAddPriceOptions{
Id: int64(opt.Id), Id: int64(opt.Id),
@ -497,9 +498,10 @@ 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 = original.Sub(price) saveAmount = decimal.NewFromInt(int64(0))
} }
langOptions = append(langOptions, &bundle.ValueAddPriceOptions{ langOptions = append(langOptions, &bundle.ValueAddPriceOptions{
Id: int64(opt.Id), Id: int64(opt.Id),
@ -581,9 +583,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 = original.Sub(price) saveAmount = decimal.NewFromInt(int64(0))
} }
langOptions = append(langOptions, &bundle.ValueAddPriceOptions{ langOptions = append(langOptions, &bundle.ValueAddPriceOptions{
Id: int64(opt.Id), Id: int64(opt.Id),