From 150452f06736b8abc2bd1092bf01a78c33f3c445 Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Thu, 8 Jan 2026 15:57:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?Updata:=E4=BD=9C=E5=93=81=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E5=A5=97=E9=A4=90?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=BF=87=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/cron/task.go | 12 ++++++++++++ pkg/service/bundle/bundleBalance.go | 24 ++++++++++++++++++++++++ pkg/service/bundle/common/msg.go | 7 +++++-- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/pkg/cron/task.go b/pkg/cron/task.go index 5e91ef6..9c5d09f 100644 --- a/pkg/cron/task.go +++ b/pkg/cron/task.go @@ -11,6 +11,7 @@ import ( bundleModel "fonchain-fiee/pkg/model/bundle" modelCast "fonchain-fiee/pkg/model/cast" "fonchain-fiee/pkg/service" + "fonchain-fiee/pkg/service/bundle/common" serverCast "fonchain-fiee/pkg/service/cast" "log" "math/rand" @@ -138,6 +139,17 @@ func AutoManuallyConfirmWorkTask() { continue } + if balanceInfoRes.BundleStatus == common.BundleExpired { + _, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{ + WorkAction: cast.WorkActionENUM_CONFIRM, + WorkUuid: req.WorkUuid, + ConfirmRemark: req.ConfirmRemark, + ConfirmStatus: 3, + }) + log.Printf("套餐已过期,作品uuid:"+req.WorkUuid, zap.Error(err)) + continue + } + wordInfoRes, err := service.CastProvider.WorkDetail(context.Background(), &cast.WorkDetailReq{ WorkUuid: req.WorkUuid, }) diff --git a/pkg/service/bundle/bundleBalance.go b/pkg/service/bundle/bundleBalance.go index d191279..4bd184c 100644 --- a/pkg/service/bundle/bundleBalance.go +++ b/pkg/service/bundle/bundleBalance.go @@ -197,6 +197,18 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量 service.Error(c, errors.New(common.GetWorkDetailFailed)) return } + + if balanceInfoRes.BundleStatus == common.BundleExpired { + _, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{ + WorkAction: cast.WorkActionENUM_CONFIRM, + WorkUuid: req.WorkUuid, + ConfirmRemark: req.ConfirmRemark, + ConfirmStatus: 3, + }) + service.Error(c, errors.New("套餐已过期")) + return + } + if wordInfoRes.WorkStatus != 4 { service.Error(c, errors.New("作品不是待确认状态")) return @@ -209,6 +221,12 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量 case 1: { if balanceInfoRes.ImageExtendConsumptionNumber >= balanceInfoRes.ImageExtendNumber { // 图文余量不足 + _, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{ + WorkAction: cast.WorkActionENUM_CONFIRM, + WorkUuid: req.WorkUuid, + ConfirmRemark: req.ConfirmRemark, + ConfirmStatus: 3, + }) service.Error(c, errors.New("图文余量不足")) return } @@ -217,6 +235,12 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量 case 2: { if balanceInfoRes.VideoExtendConsumptionNumber >= balanceInfoRes.VideoExtendNumber { // 视频余量不足 + _, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{ + WorkAction: cast.WorkActionENUM_CONFIRM, + WorkUuid: req.WorkUuid, + ConfirmRemark: req.ConfirmRemark, + ConfirmStatus: 3, + }) service.Error(c, errors.New("视频余量不足")) return } diff --git a/pkg/service/bundle/common/msg.go b/pkg/service/bundle/common/msg.go index 371a3af..f12b71d 100644 --- a/pkg/service/bundle/common/msg.go +++ b/pkg/service/bundle/common/msg.go @@ -105,6 +105,8 @@ const ( GetWorkDetailFailed = "获取作品详情失败" ) +//用户套餐状态 + // 余量 const ( BundleExtendFailed = "套餐扩展失败" @@ -122,9 +124,10 @@ const ( InsufficientBalance = "余量不足" ) +//用户套餐状态 const ( - BundleExpired = 1 - BundleNotExpired = 0 + BundleExpired = 1 //已过期 + BundleNotExpired = 0 //未过期 ) // 数据指标 From 4f742325714def3a8159978a91cb056fc07a8600 Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Thu, 8 Jan 2026 15:59:43 +0800 Subject: [PATCH 2/5] =?UTF-8?q?Updata=EF=BC=9A=E8=A1=A5=E5=85=85=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/service/bundle/bundleBalance.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/service/bundle/bundleBalance.go b/pkg/service/bundle/bundleBalance.go index 4bd184c..9d49e8f 100644 --- a/pkg/service/bundle/bundleBalance.go +++ b/pkg/service/bundle/bundleBalance.go @@ -199,7 +199,7 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量 } if balanceInfoRes.BundleStatus == common.BundleExpired { - _, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{ + _, err = service.CastProvider.UpdateStatus(c, &cast.UpdateStatusReq{ WorkAction: cast.WorkActionENUM_CONFIRM, WorkUuid: req.WorkUuid, ConfirmRemark: req.ConfirmRemark, @@ -221,7 +221,7 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量 case 1: { if balanceInfoRes.ImageExtendConsumptionNumber >= balanceInfoRes.ImageExtendNumber { // 图文余量不足 - _, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{ + _, err = service.CastProvider.UpdateStatus(c, &cast.UpdateStatusReq{ WorkAction: cast.WorkActionENUM_CONFIRM, WorkUuid: req.WorkUuid, ConfirmRemark: req.ConfirmRemark, From 6dde482bb4b5768d0635da54b090350394f44686 Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Thu, 8 Jan 2026 16:00:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?Updata=EF=BC=9A=E8=A1=A5=E5=85=85=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/service/bundle/bundleBalance.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/service/bundle/bundleBalance.go b/pkg/service/bundle/bundleBalance.go index 9d49e8f..9cf5fa5 100644 --- a/pkg/service/bundle/bundleBalance.go +++ b/pkg/service/bundle/bundleBalance.go @@ -235,7 +235,7 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量 case 2: { if balanceInfoRes.VideoExtendConsumptionNumber >= balanceInfoRes.VideoExtendNumber { // 视频余量不足 - _, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{ + _, err = service.CastProvider.UpdateStatus(c, &cast.UpdateStatusReq{ WorkAction: cast.WorkActionENUM_CONFIRM, WorkUuid: req.WorkUuid, ConfirmRemark: req.ConfirmRemark, From 93c085fb94482f746d296ff4c8bed452598636f2 Mon Sep 17 00:00:00 2001 From: zhoujunyao Date: Fri, 9 Jan 2026 09:55:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E8=B4=A6=E5=8F=B7=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=BB=8E3=E5=88=B7=E6=88=905?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/service/bundle/reconciliation.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/service/bundle/reconciliation.go b/pkg/service/bundle/reconciliation.go index 2102954..fea7a0e 100644 --- a/pkg/service/bundle/reconciliation.go +++ b/pkg/service/bundle/reconciliation.go @@ -366,7 +366,7 @@ func AutoCreateUserAndOrder(c *gin.Context) { ValueUid: accountUuid, CurrencyType: 2, //美元 Amount: 0, //增值服务金额 - Num: 3, + Num: 5, Unit: "个", Source: 1, PaymentStatus: 1, From 1d136ceb8f8d73da9720fed3bf8d8baaabde1ee9 Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Fri, 9 Jan 2026 10:16:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?Updata=EF=BC=9A=E4=BF=AE=E6=AD=A3=E7=B2=BE?= =?UTF-8?q?=E5=BA=A6=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/service/bundle/bundleMetrics.go | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkg/service/bundle/bundleMetrics.go b/pkg/service/bundle/bundleMetrics.go index ce7fc9e..bb62f18 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), "合计支付金额（美元）")