diff --git a/pkg/service/bundle/bundleMetrics.go b/pkg/service/bundle/bundleMetrics.go index daf37d7..cbcf817 100644 --- a/pkg/service/bundle/bundleMetrics.go +++ b/pkg/service/bundle/bundleMetrics.go @@ -93,9 +93,30 @@ func MetricsBundlePurchaseExport(ctx *gin.Context) { sumFee := decimal.Zero for _, i := range data { - sumPayment = sumPayment.Add(decimal.NewFromFloat(float64(i.PaymentAmount))) - sumFinal = sumFinal.Add(decimal.NewFromFloat(float64(i.FinalAmount))) - sumFee = sumFee.Add(decimal.NewFromFloat(float64(i.FeeAmount))) + + s := fmt.Sprintf("%.2f", i.PaymentAmount) + d, err := decimal.NewFromString(s) + if err != nil { + service.Error(ctx, errors.New(common.MetricsBundlePurchaseExportFailed)) + return + } + sumPayment = sumPayment.Add(d) + + s = fmt.Sprintf("%.2f", i.FinalAmount) + d, err = decimal.NewFromString(s) + if err != nil { + service.Error(ctx, errors.New(common.MetricsBundlePurchaseExportFailed)) + return + } + sumFinal = sumFinal.Add(d) + + s = fmt.Sprintf("%.2f", i.FeeAmount) + d, err = decimal.NewFromString(s) + if err != nil { + service.Error(ctx, errors.New(common.MetricsBundlePurchaseExportFailed)) + return + } + sumFee = sumFee.Add(d) } f.SetCellValue(sheet, fmt.Sprintf("A%d", endRow+1), "合计支付金额(美元)") diff --git a/pkg/service/bundle/common/msg.go b/pkg/service/bundle/common/msg.go index f29e84b..e10cdb8 100644 --- a/pkg/service/bundle/common/msg.go +++ b/pkg/service/bundle/common/msg.go @@ -21,7 +21,7 @@ const ( OnlyAddValueListByOrderNoFailed = "根据订单号查询增值套餐失败" ) -//官网报告 +// 官网报告 const ( ErrorCreateReportFailed = "创建官网报告失败" ErrorDeleteReportFailed = "删除官网报告失败" @@ -30,7 +30,7 @@ const ( ErrorDisplayReportFailed = "显示官网报告失败" ) -//官网成员管理 +// 官网成员管理 const ( ErrorCreateMemberFailed = "创建官网成员失败" ErrorDeleteMemberFailed = "删除官网成员失败" @@ -45,7 +45,7 @@ const ( ErrorDisplayBoardOfDirectorsFailed = "显示董事会成员失败" ) -//官网邮箱通知 +// 官网邮箱通知 const ( ErrorEmailAlertSubmitFailed = "提交邮箱通知失败" ErrorGetEmailInformationListFailed = "获取邮箱通知列表失败" @@ -99,13 +99,13 @@ const ( BundleUnBindingAddService = "套餐未绑定增值服务" ) -//发布 +// 发布 const ( UpdateWorkStatusFailed = "更新作品状态失败" GetWorkDetailFailed = "获取作品详情失败" ) -//余量 +// 余量 const ( BundleExtendFailed = "套餐扩展失败" BundleExtendRecordsListFailed = "套餐扩展记录列表查询失败" @@ -122,12 +122,13 @@ const ( InsufficientBalance = "余量不足" ) +// 用户套餐状态 const ( - BundleExpired = 1 - BundleNotExpired = 0 + BundleExpired = 1 //已过期 + BundleNotExpired = 0 //未过期 ) -//数据指标 +// 数据指标 const ( MetricsBusinessFailed = "业务概览查询失败" MetricsOperatingFailed = "运营数据查询失败" @@ -138,7 +139,7 @@ const ( BalanceMetricsExportFailed = "服务使用明细数据导出失败" ) -//素材库 +// 素材库 const ( FileListFailed = "素材库列表查询失败" FileUsageFailed = "素材库使用情况查询失败" @@ -156,7 +157,7 @@ const ( ERROR_OPEN_FILE = "打开文件错误" ) -//官网 +// 官网 const ( CreateSecFilingFailed = "创建官方信息失败" UpdateSecFilingFailed = "更新官方信息失败" diff --git a/pkg/service/bundle/reconciliation.go b/pkg/service/bundle/reconciliation.go index 134c0a8..6bfa88b 100644 --- a/pkg/service/bundle/reconciliation.go +++ b/pkg/service/bundle/reconciliation.go @@ -342,7 +342,7 @@ func AutoCreateUserAndOrder(c *gin.Context) { ValueUid: accountUuid, CurrencyType: 2, //美元 Amount: 0, //增值服务金额 - Num: 3, + Num: 5, Unit: "个", Source: 1, PaymentStatus: 1, diff --git a/pkg/service/cast/work.go b/pkg/service/cast/work.go index d7cc14b..76303fc 100644 --- a/pkg/service/cast/work.go +++ b/pkg/service/cast/work.go @@ -715,7 +715,7 @@ func PostAS(workUuid string) error { LocationId: "", UserTags: nil, Collaborators: nil, - AutoResize: false, + AutoResize: true, DisableComments: false, } case cast.PlatformIDENUM_TIKTOK: