Merge branch 'dev-lzh-1009' into dev

internal/dao/bundleExtend.go

@@ -218,8 +218,11 @@ func CreateBundleBalance(data model.BundleBalance) error {
 	return app.ModuleClients.BundleDB.Create(&data).Error
 }
 
-func GetUsedRecord(req *bundle.GetUsedRecordListReq) (data []model.CostLog, total int64, err error) {
-	session := app.ModuleClients.BundleDB.Model(&model.CostLog{})
+func GetUsedRecord(req *bundle.GetUsedRecordListReq) (data []model.CostLogPo, total int64, err error) {
+	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 != "" {
 		session = session.Where("work_title like ?", "%"+req.WorkTitle+"%")
 	}

internal/model/cast.go

@@ -46,6 +46,7 @@ func (m *CastWorkExtra) TableName() string {
 type CostLogPo struct {
 	CostLog
 	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 {

pb/bundle.proto

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