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