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

Merge branch 'feat-hjj-CastWork#' into dev

Browse Source
This commit is contained in:
jiaji.H 2025-11-26 11:42:53 +08:00
commit 4b21bfd759
5 changed files with 99 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/service/bundle/bundleBalance.go
View File

@ -8,6 +8,7 @@ import (
"fonchain-fiee/api/bundle"
"fonchain-fiee/api/cast"
"fonchain-fiee/pkg/service"
"fonchain-fiee/pkg/service/bundle/common"
"fonchain-fiee/pkg/utils"
"io"
"log"
@ -36,7 +37,7 @@ func BundleExtend(c *gin.Context) {
}
res, err := service.BundleProvider.BundleExtend(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.BundleExtendFailed))
return
}
service.Success(c, res)
@ -50,7 +51,7 @@ func BundleExtendRecordsList(c *gin.Context) {
}
res, err := service.BundleProvider.BundleExtendRecordsList(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.BundleExtendRecordsListFailed))
return
}
service.Success(c, res)
@ -64,7 +65,7 @@ func GetBundleBalance(c *gin.Context) {
}
res, err := service.BundleProvider.GetBundleBalanceList(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.GetBundleBalanceListFailed))
return
}
service.Success(c, res)
@ -78,7 +79,7 @@ func GetUsedRecordList(c *gin.Context) {
}
res, err := service.BundleProvider.GetUsedRecordList(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.GetUsedRecordListFailed))
return
}
service.Success(c, res)
@ -141,7 +142,7 @@ func GetToBeComfirmedWorks(c *gin.Context) {
req.ArtistUuid = strconv.Itoa(int(userInfo.ID))
res, err := service.BundleProvider.ToBeComfirmedWorks(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.ToBeComfirmedWorksFailed))
return
}
service.Success(c, res)
@ -153,7 +154,7 @@ func GetUserBalance(c *gin.Context) {
UserId: int32(userInfo.ID),
})
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.GetUserBalanceFailed))
return
}
service.Success(c, res)
@ -186,7 +187,7 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量
UserId: int32(userInfo.ID),
})
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.GetUserBalanceFailed))
return
}
@ -228,7 +229,7 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量
}
resp, err := service.BundleProvider.AddBundleBalance(c, &addBalanceReq)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.AddBundleBalanceFailed))
return
}
res, err := service.CastProvider.UpdateStatus(c, &cast.UpdateStatusReq{
@ -253,7 +254,7 @@ func CastLogConfirm(ctx *gin.Context) {
}
res, err := service.BundleProvider.ConfirmWork(context.Background(), &req)
if err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.ConfirmWorkFailed))
return
}
service.Success(ctx, res)
@ -267,7 +268,7 @@ func BundleActivate(ctx *gin.Context) {
}
res, err := service.BundleProvider.BundleActivate(context.Background(), &req)
if err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.BundleActivateFailed))
return
}
service.Success(ctx, res)
@ -286,11 +287,11 @@ func BundleExport(ctx *gin.Context) {
utils.CheckDirPath("./runtime/"+fmt.Sprint(userInfo.ID), true)
res, err := service.BundleProvider.BundleBalanceExport(context.Background(), &req)
if err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.BundleExportFailed))
return
}
if err := writeToExcel(filePath, res.Data); err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.BundleExportFailed))
return
}
var scheme string
@ -315,7 +316,7 @@ func SetBalanceLayout(ctx *gin.Context) {
}
res, err := service.BundleProvider.SetBundleBalanceLayout(context.Background(), &req)
if err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.SetBalanceLayoutFailed))
return
}
service.Success(ctx, res)
@ -327,7 +328,7 @@ func GetBalanceLayout(ctx *gin.Context) {
}
res, err := service.BundleProvider.GetBundleBalanceLayout(context.Background(), &req)
if err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.GetBalanceLayoutFailed))
return
}
var j any
@ -466,7 +467,7 @@ func GetAccountBundleBalance(c *gin.Context) {
req.Month = time.Now().Format("2006-01")
res, err := service.BundleProvider.GetBundleBalanceList(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.GetBundleBalanceListFailed))
return
}
result := bundleModel.GetBundleBalanceListResp{

30
pkg/service/bundle/bundleMetrics.go
View File

@ -2,12 +2,14 @@ package bundle
import (
"context"
"errors"
"fmt"
"fonchain-fiee/api/bundle"
"fonchain-fiee/api/cast"
logicCast "fonchain-fiee/pkg/logic/cast"
"fonchain-fiee/pkg/model/login"
"fonchain-fiee/pkg/service"
"fonchain-fiee/pkg/service/bundle/common"
serviceCast "fonchain-fiee/pkg/service/cast"
"fonchain-fiee/pkg/utils"
"reflect"
@ -30,7 +32,7 @@ func MetricsBusiness(ctx *gin.Context) {
}
resp, err := service.BundleProvider.MetricsBusiness(ctx, &req)
if err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.MetricsBusinessFailed))
return
}
service.Success(ctx, resp)
@ -44,7 +46,7 @@ func MetricsOpratorCreate(ctx *gin.Context) {
}
resp, err := service.BundleProvider.MetricsOperatingCreate(ctx, &req)
if err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.MetricsOperatingFailed))
return
}
service.Success(ctx, resp)
@ -58,7 +60,7 @@ func MetricsOpratorStatus(ctx *gin.Context) {
}
resp, err := service.BundleProvider.MetricsOperatingStatus(ctx, &req)
if err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.MetricsOperatingFailed))
return
}
service.Success(ctx, resp)
@ -73,7 +75,7 @@ func MetricsBundlePurchaseExport(ctx *gin.Context) {
resp, err := service.BundleProvider.MetricsBundlePurchaseExport(ctx, &req)
if err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.MetricsBundlePurchaseExportFailed))
return
}
userInfo := login.GetUserInfoFromC(ctx)
@ -133,7 +135,7 @@ func MetricsBundlePurchaseExport(ctx *gin.Context) {
if err := exportStructToExcel(resp.Data, []string{
"订单编号", "套餐", "用户编号", "客户姓名", "手机号", "支付时间", "套餐视频数", "增值视频数", "套餐金额", "增值金额", "支付金额", "结算金额", "手续费", "汇率（%）",
}, filePath, statistic); err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.MetricsBundlePurchaseExportFailed))
return
}
var scheme string
@ -157,7 +159,7 @@ func MetricsArtistAccountExport(ctx *gin.Context) {
}
resp, err := service.BundleProvider.MetricsArtistAccountExport(ctx, &req)
if err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.MetricsArtistAccountExportFailed))
return
}
userInfo := login.GetUserInfoFromC(ctx)
@ -205,7 +207,7 @@ func MetricsArtistAccountExport(ctx *gin.Context) {
// 保存文件
if err := f.SaveAs(filePath); err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.MetricsArtistAccountExportFailed))
return
}
var exportUrl string = fmt.Sprintf("%s://%s/api/fiee/static/%s", scheme, ctx.Request.Host, strings.Replace(filePath, "./runtime/", "", 1))
@ -242,13 +244,13 @@ func MetricsVideoSubmitExport(ctx *gin.Context) {
fmt.Printf("resp.Count: %v\n", resp.Count)
}
if err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.MetricsVideoSubmitExportFailed))
return
}
var loigcCastWork = new(logicCast.Work)
excelFile, err := loigcCastWork.ExportExcelWorkList(resp.Data)
if err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.MetricsVideoSubmitExportFailed))
return
}
userInfo := login.GetUserInfoFromC(ctx)
@ -257,7 +259,7 @@ func MetricsVideoSubmitExport(ctx *gin.Context) {
utils.CheckDirPath("./runtime/"+fmt.Sprint(userInfo.ID), true)
// 保存文件
if err := excelFile.SaveAs(filePath); err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.MetricsVideoSubmitExportFailed))
return
}
var scheme string
@ -342,7 +344,7 @@ func MetricsBalanceDetailExport(ctx *gin.Context) {
}
resp, err := service.BundleProvider.BundleBalanceExport(ctx, &req)
if err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.MetricsBalanceDetailExportFailed))
return
}
@ -443,7 +445,7 @@ func MetricsBalanceDetailExport(ctx *gin.Context) {
"增值视频总数", "套餐视频单价", "增值视频单价", "当前需要上传套餐视频数", "当前需要上传增值视频数",
"当前已上传套餐视频数", "当前已上传增值视频数", "当前套餐视频已消费总金额", "当前增值视频已消费总金额",
}, filePath, yelloStyle, statistic); err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.MetricsBalanceDetailExportFailed))
return
}
var scheme string
@ -499,11 +501,11 @@ func BalanceMetricsExport(ctx *gin.Context) {
utils.CheckDirPath("./runtime/"+fmt.Sprint(userInfo.ID), true)
res, err := service.BundleProvider.BundleBalanceExport(context.Background(), &req)
if err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.BalanceMetricsExportFailed))
return
}
if err := writeToExcel(filePath, res.Data); err != nil {
service.Error(ctx, err)
service.Error(ctx, errors.New(common.BalanceMetricsExportFailed))
return
}
var scheme string

22
pkg/service/bundle/bundleProfile.go
View File

@ -2,8 +2,10 @@ package bundle
import (
"context"
"errors"
"fonchain-fiee/api/bundle"
"fonchain-fiee/pkg/service"
"fonchain-fiee/pkg/service/bundle/common"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
@ -19,7 +21,7 @@ func CreateBundle(c *gin.Context) {
res, err := service.BundleProvider.CreateBundle(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.CreateBundleFailed))
return
}
@ -36,7 +38,7 @@ func UpdateBundle(c *gin.Context) {
res, err := service.BundleProvider.UpdateBundle(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.UpdateBundleFailed))
return
}
@ -54,7 +56,7 @@ func DeleteBundle(c *gin.Context) {
res, err := service.BundleProvider.DeleteBundle(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.DeleteBundleFailed))
return
}
@ -71,7 +73,7 @@ func BundleList(c *gin.Context) {
res, err := service.BundleProvider.BundleList(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.BundleListFailed))
return
}
@ -88,7 +90,7 @@ func SaveBundleV2(c *gin.Context) {
res, err := service.BundleProvider.SaveBundle(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.UpdateBundleFailed))
return
}
@ -105,7 +107,7 @@ func BundleListV2(c *gin.Context) {
res, err := service.BundleProvider.BundleListV2(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.BundleListFailed))
return
}
@ -121,7 +123,7 @@ func BundleDetailV2(c *gin.Context) {
req.Language = language
res, err := service.BundleProvider.BundleDetailV2(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.BundleDetailFailed))
return
}
@ -135,7 +137,7 @@ func HandShelf(c *gin.Context) {
}
res, err := service.BundleProvider.HandShelf(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.HandShelfFailed))
return
}
service.Success(c, res)
@ -149,7 +151,7 @@ func OnlyAddValueListByOrderNo(c *gin.Context) {
}
res, err := service.BundleProvider.OnlyAddValueListByOrderNo(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.OnlyAddValueListByOrderNoFailed))
return
}
@ -165,7 +167,7 @@ func BundleListH5V2(c *gin.Context) {
res, err := service.BundleProvider.BundleListH5V2(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.BundleListFailed))
return
}

48
pkg/service/bundle/common/msg.go
View File

@ -2,9 +2,23 @@ package common
// 套餐
const (
MissBundleUUID = "缺少套餐UUID"
MissOrderSignature = "缺少客户签名信息"
ErrorInsertSignature = "插入签名失败"
MissBundleUUID = "缺少套餐UUID"
MissOrderSignature = "缺少客户签名信息"
ErrorInsertSignature = "插入签名失败"
CreateValueAddBundleFailed = "创建增值套餐失败"
ValueAddBundleListFailed = "增值套餐列表查询失败"
ValueAddBundleDetailFailed = "增值套餐详情查询失败"
SaveValueAddServiceFailed = "保存增值套餐失败"
ValueAddServiceListFailed = "套餐服务列表查询失败"
ValueAddServiceDetailFailed = "套餐服务详情查询失败"
ValueAddServiceLangDetailFailed = "套餐服务语言详情查询失败"
CreateBundleFailed = "创建套餐失败"
UpdateBundleFailed = "更新套餐失败"
DeleteBundleFailed = "删除套餐失败"
BundleListFailed = "套餐列表查询失败"
BundleDetailFailed = "套餐详情查询失败"
HandShelfFailed = "更新套餐上下架失败"
OnlyAddValueListByOrderNoFailed = "根据订单号查询增值套餐失败"
)
// 订单
@ -55,6 +69,34 @@ const (
BundleUnBindingAddService = "套餐未绑定增值服务"
)
//余量
const (
BundleExtendFailed = "套餐扩展失败"
BundleExtendRecordsListFailed = "套餐扩展记录列表查询失败"
GetBundleBalanceListFailed = "套餐余额列表查询失败"
GetUsedRecordListFailed = "套餐使用记录列表查询失败"
GetUserBalanceFailed = "套餐余额查询失败"
ToBeComfirmedWorksFailed = "待确认作品列表查询失败"
ConfirmWorkFailed = "确认消耗余量失败"
AddBundleBalanceFailed = "添加消耗余量失败"
BundleActivateFailed = "套餐激活失败"
BundleExportFailed = "套餐余量导出失败"
SetBalanceLayoutFailed = "设置套餐余额布局失败"
GetBalanceLayoutFailed = "获取套餐余额布局失败"
InsufficientBalance = "余量不足"
)
//数据指标
const (
MetricsBusinessFailed = "业务概览查询失败"
MetricsOperatingFailed = "运营数据查询失败"
MetricsBundlePurchaseExportFailed = "套餐购买数据导出失败"
MetricsArtistAccountExportFailed = "艺人账号数据导出失败"
MetricsVideoSubmitExportFailed = "视频上传数据导出失败"
MetricsBalanceDetailExportFailed = "服务使用明细数据导出失败"
BalanceMetricsExportFailed = "服务使用明细数据导出失败"
)
/*var EnMessages = map[string]string{
"创建套餐信息失败": "Failed to create bundle information",
"创建套餐信息成功": "Successfully created bundle information",

18
pkg/service/bundle/valueAddBundle.go
View File

@ -2,10 +2,12 @@ package bundle
import (
"context"
"errors"
"fmt"
"fonchain-fiee/api/bundle"
"fonchain-fiee/pkg/model/login"
"fonchain-fiee/pkg/service"
"fonchain-fiee/pkg/service/bundle/common"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
@ -22,7 +24,7 @@ func CreateValueAddBundle(c *gin.Context) {
res, err := service.BundleProvider.CreateValueAddBundle(context.Background(), &req)
if err != nil {
fmt.Println(err)
service.Error1(c, err)
service.Error1(c, errors.New(common.CreateValueAddBundleFailed))
return
}
@ -33,7 +35,7 @@ func ValueAddBundleList(c *gin.Context) {
var req bundle.ValueAddBundleListRequest
if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
service.Error1(c, err)
service.Error(c, err)
return
}
@ -44,7 +46,7 @@ func ValueAddBundleList(c *gin.Context) {
res, err := service.BundleProvider.ValueAddBundleList(context.Background(), &req)
if err != nil {
service.Error1(c, err)
service.Error(c, errors.New(common.ValueAddBundleListFailed))
return
}
@ -61,7 +63,7 @@ func ValueAddBundleDetail(c *gin.Context) {
res, err := service.BundleProvider.ValueAddBundleDetail(context.Background(), &req)
if err != nil {
service.Error1(c, err)
service.Error(c, errors.New(common.ValueAddBundleDetailFailed))
return
}
@ -78,7 +80,7 @@ func SaveValueAddService(c *gin.Context) {
res, err := service.BundleProvider.SaveValueAddService(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.SaveValueAddServiceFailed))
return
}
service.Success(c, res)
@ -93,7 +95,7 @@ func ValueAddServiceList(c *gin.Context) {
res, err := service.BundleProvider.ValueAddServiceList(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.ValueAddServiceListFailed))
return
}
service.Success(c, res)
@ -108,7 +110,7 @@ func ValueAddServiceDetail(c *gin.Context) {
res, err := service.BundleProvider.ValueAddServiceDetail(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.ValueAddServiceDetailFailed))
return
}
service.Success(c, res)
@ -124,7 +126,7 @@ func ValueAddServiceLangDetail(c *gin.Context) {
req.Language = language
res, err := service.BundleProvider.ValueAddServiceLangByUuidAndLanguage(context.Background(), &req)
if err != nil {
service.Error(c, err)
service.Error(c, errors.New(common.ValueAddServiceLangDetailFailed))
return
}
service.Success(c, res)