fiee/micro-bundle
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-lzh-1009' into dev

Browse Source
This commit is contained in:
lzh 2025-10-10 10:31:42 +08:00
commit 2756006a7f
4 changed files with 775 additions and 760 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/dao/bundleExtend.go
View File

@ -218,8 +218,11 @@ func CreateBundleBalance(data model.BundleBalance) error {
return app.ModuleClients.BundleDB.Create(&data).Error return app.ModuleClients.BundleDB.Create(&data).Error
} }
func GetUsedRecord(req *bundle.GetUsedRecordListReq) (data []model.CostLog, total int64, err error) { func GetUsedRecord(req *bundle.GetUsedRecordListReq) (data []model.CostLogPo, total int64, err error) {
session := app.ModuleClients.BundleDB.Model(&model.CostLog{}) session := app.ModuleClients.BundleDB.
Table("cast_cost_log ccl").
Select("ccl.*,cwl.cost_type").
Joins("left join cast_work_log cwl on cwl.work_uuid = ccl.work_uuid")
if req.WorkTitle != "" { if req.WorkTitle != "" {
session = session.Where("work_title like ?", "%"+req.WorkTitle+"%") session = session.Where("work_title like ?", "%"+req.WorkTitle+"%")
} }

1
internal/model/cast.go
View File

@ -46,6 +46,7 @@ func (m *CastWorkExtra) TableName() string {
type CostLogPo struct { type CostLogPo struct {
CostLog CostLog
ArtistConfirmedTime int64 `gorm:"column:artist_confirmed_time;type:bigint(20);default:0;comment:艺人确认时间;NOT NULL" json:"artist_confirmed_time"` ArtistConfirmedTime int64 `gorm:"column:artist_confirmed_time;type:bigint(20);default:0;comment:艺人确认时间;NOT NULL" json:"artist_confirmed_time"`
CostType int `gorm:"column:cost_type;type:int(11)" json:"costType"`
} }
type CastWorkImage struct { type CastWorkImage struct {

1
pb/bundle.proto
View File

@ -786,6 +786,7 @@ message WorkCastItem{
string operatorPhone = 14; // 操作人手机号 string operatorPhone = 14; // 操作人手机号
uint32 status = 15; // 1 有效 2 失效 uint32 status = 15; // 1 有效 2 失效
string artistConfirmedTime = 16; // 艺人确认时间 string artistConfirmedTime = 16; // 艺人确认时间
uint32 costType = 17;
} }
message GetImageWorkDetailReq { message GetImageWorkDetailReq {

1526
pb/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff