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:34:40 +08:00
commit a725fb7d98
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,31 +99,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