Merge branch 'feature-userinfo-daiyb' into dev

pkg/logic/cast/work.go

@@ -24,7 +24,8 @@ func (w *Work) ExportExcelWorkList(data []*cast.WorkListResp_Info) (*excelize.Fi
 
 	// 表头
 	headers := []interface{}{
-		"艺人", "手机号", "作品标题", "作品类型", "类型", "发布平台", "提交时间", "作品状态", "发布账号", "管理人",
+		"艺人", "手机号", "用户编号", "作品标题", "脚本", "作品类型", "类型", "Ins", "Tiktok", "DM", "作品状态", "验收确认类型",
+		"说明", "发布账号", "管理人", "上传时间", "待艺人确认时间", "验收确认通过时间", "发布成功时间",
 	}
 	if err := sw.SetRow("A1", headers); err != nil {
 		return nil, err
@@ -34,13 +35,13 @@ func (w *Work) ExportExcelWorkList(data []*cast.WorkListResp_Info) (*excelize.Fi
 	rowIndex := 2
 	for _, info := range data {
 		// 拼接字段
-		platformNames := strings.Join(func() []string {
+		//platformNames := strings.Join(func() []string {
-			arr := make([]string, 0, len(info.PlatformIDs))
+		//	arr := make([]string, 0, len(info.PlatformIDs))
-			for _, v := range info.PlatformIDs {
+		//	for _, v := range info.PlatformIDs {
-				arr = append(arr, modelCast.PlatformIDMM[int(v)])
+		//		arr = append(arr, modelCast.PlatformIDMM[int(v)])
-			}
+		//	}
-			return arr
+		//	return arr
-		}(), "/")
+		//}(), "/")
 
 		var mediaAccountNames string
 		var managerNames string
@@ -63,14 +64,25 @@ func (w *Work) ExportExcelWorkList(data []*cast.WorkListResp_Info) (*excelize.Fi
 		row := []interface{}{
 			info.ArtistName,
 			info.ArtistPhone,
+			info.ArtistSubNum,
 			info.Title,
+			info.ScriptTitle,
 			modelCast.WorkCategoryMM[int(info.WorkCategory)],
 			modelCast.WorkCostTypeMM[int(info.CostType)],
-			platformNames,
+			info.InsStatus,
-			info.SubmitTime,
+			info.TiktokStatus,
+			info.DmStatus,
 			modelCast.WorkStatusMM[int(info.WorkStatus)],
+			modelCast.ConfirmTypeMM[int(info.ConfirmType)],
+			info.Remark,
 			mediaAccountNames,
 			managerNames,
+			info.Status1Time,
+			info.Status4Time,
+			info.Status9Time,
+			info.Status6Time,
+			//platformNames,
+			//info.SubmitTime,
 		}
 
 		cell, _ := excelize.CoordinatesToCellName(1, rowIndex)

pkg/model/cast/work.go

@@ -47,6 +47,10 @@ var WorkStatusMM = map[int]string{
 	8: "未知",
 	9: "验证确认",
 }
+var ConfirmTypeMM = map[int]string{
+	1: "艺人确认",
+	2: "系统确认",
+}
 
 type DMPost struct {
 	ID        string `json:"id"`

pkg/service/cast/test.go

@@ -85,7 +85,7 @@ func Test(ctx *gin.Context) {
 		//profileKey := ctx.PostForm("profileKey")
 		resp, err := service.AyrshareProvider.GetProfiles(context.Background(), &aryshare.GetProfilesRequest{
 			Title:                        "",
-			RefId:                        "",
+			RefId:                        "79f8d38afe5922f19bd02b21f838354ae8927d66",
 			HasActiveSocialAccounts:      false,
 			IncludesActiveSocialAccounts: nil,
 			ActionLog:                    nil,