fiee/fonchain-fiee
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
桀尼龟 2025-06-11 14:33:48 +08:00
parent 8f4dd8aee0
commit db54a355e8
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pkg/service/bundle/bundleOrder.go
View File

@ -12,7 +12,6 @@ import (
"fonchain-fiee/pkg/service/bundle/common" "fonchain-fiee/pkg/service/bundle/common"
"fonchain-fiee/pkg/service/bundle/logic" "fonchain-fiee/pkg/service/bundle/logic"
bundleModel "fonchain-fiee/pkg/service/bundle/model" bundleModel "fonchain-fiee/pkg/service/bundle/model"
"math/big"
"strconv" "strconv"
"strings" "strings"
@ -98,31 +97,31 @@ func CreateBundleOrderSignature(c *gin.Context) {
} }
//获取增值套餐信息 //获取增值套餐信息
if req.ValueAddBundleUuid != "" { //if req.ValueAddBundleUuid != "" {
valueAddBundleDetail, err := service.BundleProvider.ValueAddBundleDetail(context.Background(), &bundle.ValueAddBundleDetailRequest{ // valueAddBundleDetail, err := service.BundleProvider.ValueAddBundleDetail(context.Background(), &bundle.ValueAddBundleDetailRequest{
Uuid: req.ValueAddBundleUuid, // Uuid: req.ValueAddBundleUuid,
}) // })
if err != nil { // if err != nil {
service.Error(c, err) // service.Error(c, err)
return // return
} // }
//
req.ValueAddBundleUuid = valueAddBundleDetail.Data.Uuid // req.ValueAddBundleUuid = valueAddBundleDetail.Data.Uuid
req.ValueAddOriginalPrice = valueAddBundleDetail.Data.OriginalPrice // req.ValueAddOriginalPrice = valueAddBundleDetail.Data.OriginalPrice
req.ValueAddDiscountPrice = valueAddBundleDetail.Data.DiscountPrice // req.ValueAddDiscountPrice = valueAddBundleDetail.Data.DiscountPrice
req.AddBundleCommonUid = valueAddBundleDetail.Data.AddBundleCommonUid // req.AddBundleCommonUid = valueAddBundleDetail.Data.AddBundleCommonUid
//
if valueAddBundleDetail.Data.Choose { // 可选条数 // if valueAddBundleDetail.Data.Choose { // 可选条数
req.ValueAddBundleAmount = valueAddBundleDetail.Data.DiscountPrice * float32(req.Num) // req.ValueAddBundleAmount = valueAddBundleDetail.Data.DiscountPrice * float32(req.Num)
discount, _ := new(big.Float).Sub(big.NewFloat(float64(valueAddBundleDetail.Data.OriginalPrice)), big.NewFloat(float64(valueAddBundleDetail.Data.DiscountPrice))).Float32() // discount, _ := new(big.Float).Sub(big.NewFloat(float64(valueAddBundleDetail.Data.OriginalPrice)), big.NewFloat(float64(valueAddBundleDetail.Data.DiscountPrice))).Float32()
req.ValueAddSavedAmount = discount * float32(req.Num) // req.ValueAddSavedAmount = discount * float32(req.Num)
} else { // 固定条数 // } else { // 固定条数
req.ValueAddBundleAmount = valueAddBundleDetail.Data.TotalPrice // req.ValueAddBundleAmount = valueAddBundleDetail.Data.TotalPrice
req.ValueAddSavedAmount = valueAddBundleDetail.Data.SavedAmount // req.ValueAddSavedAmount = valueAddBundleDetail.Data.SavedAmount
} // }
//
req.TotalAmount, _ = new(big.Float).Add(big.NewFloat(float64(req.ValueAddBundleAmount)), big.NewFloat(float64(bundleDetail.Bundle.Price))).Float32() // req.TotalAmount, _ = new(big.Float).Add(big.NewFloat(float64(req.ValueAddBundleAmount)), big.NewFloat(float64(bundleDetail.Bundle.Price))).Float32()
} //}
req.BundleName = bundleDetail.Bundle.Name req.BundleName = bundleDetail.Bundle.Name
req.Amount = bundleDetail.Bundle.Price req.Amount = bundleDetail.Bundle.Price