|
|
@@ -260,10 +260,10 @@ func GetSignInOfflineTask(projectForm int32) error {
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- projectIdMap := make(map[int64]int64)
|
|
|
- taskIDs := make(map[int]int)
|
|
|
- var projectIds []int64
|
|
|
- var taskIds []int
|
|
|
+ projectIdMap := make(map[string]int64)
|
|
|
+ taskIDs := make(map[string]string)
|
|
|
+ var projectIds []string
|
|
|
+ var taskIds []string
|
|
|
var t int32
|
|
|
for _, projectInfo := range projectInfos {
|
|
|
autoTaskId := projectInfo.AutoTaskID
|
|
|
@@ -293,18 +293,21 @@ func GetSignInOfflineTask(projectForm int32) error {
|
|
|
db2.Model(gorm_model.YoungeeTaskLogistics{}).Where("task_id = ?", taskInfo.TaskId).Find(&logisticInfo)
|
|
|
fmt.Println("logisticID", logisticInfo.LogisticsID)
|
|
|
dd, _ := time.ParseDuration(conv.MustString(t, "") + "h")
|
|
|
- if logisticInfo.AutoSignAt.IsZero() {
|
|
|
+ if logisticInfo.AutoSignAt == nil || logisticInfo.AutoSignAt.IsZero() {
|
|
|
+ t := logisticInfo.DeliveryTime.Add(dd)
|
|
|
db5 := GetReadDB(context.Background())
|
|
|
db5.Model(gorm_model.YoungeeTaskLogistics{}).Where("logistics_id = ?", logisticInfo.LogisticsID).
|
|
|
- Updates(&gorm_model.YoungeeTaskLogistics{AutoSignAt: logisticInfo.DeliveryTime.Add(dd)})
|
|
|
+ Updates(&gorm_model.YoungeeTaskLogistics{AutoSignAt: &t})
|
|
|
+ err = CreateTaskLog(context.Background(), taskInfo.TaskId, "签收时间")
|
|
|
+ if err != nil {
|
|
|
+ logrus.WithContext(context.Background()).Errorf("[Script service] call CreateTaskLog error,err:%+v", err)
|
|
|
+ }
|
|
|
fmt.Println("已添加自动签收时间")
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- //fmt.Println("projectIdMap", projectIdMap)
|
|
|
- //fmt.Println("taskIds", taskIds)
|
|
|
var logisticInfos []gorm_model.YoungeeTaskLogistics
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
err = db3.Model(gorm_model.YoungeeTaskLogistics{}).Where("auto_sign_at <= ? AND task_id IN ?", time.Now(), taskIds).Find(&logisticInfos).Error
|
|
|
@@ -312,28 +315,32 @@ func GetSignInOfflineTask(projectForm int32) error {
|
|
|
log.Println("DB AutoGetSignInOfflineTask error :", err)
|
|
|
return err
|
|
|
}
|
|
|
- var signedTaskId []int64
|
|
|
+ var signedTaskId []string
|
|
|
for _, logisticInfo := range logisticInfos {
|
|
|
signedTaskId = append(signedTaskId, logisticInfo.TaskID)
|
|
|
if logisticInfo.SignedTime.IsZero() {
|
|
|
db6 := GetReadDB(context.Background())
|
|
|
db6.Model(gorm_model.YoungeeTaskLogistics{}).Where("logistics_id = ?", logisticInfo.LogisticsID).Updates(&gorm_model.YoungeeTaskLogistics{SignedTime: time.Now(), Status: 1})
|
|
|
+ err = CreateTaskLog(context.Background(), logisticInfo.TaskID, "签收时间")
|
|
|
+ if err != nil {
|
|
|
+ logrus.WithContext(context.Background()).Errorf("[Script service] call CreateTaskLog error,err:%+v", err)
|
|
|
+ }
|
|
|
fmt.Println("已更新签收时间")
|
|
|
}
|
|
|
}
|
|
|
- util.RemoveRepByMap(signedTaskId)
|
|
|
+ signedTaskId = util.RemoveStrRepByMap(signedTaskId)
|
|
|
//fmt.Println("signedTaskId", signedTaskId)
|
|
|
for _, taskID := range signedTaskId {
|
|
|
//fmt.Println("taskID", taskID)
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
taskNeedMod := gorm_model.YoungeeTaskInfo{}
|
|
|
db4.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskID).Find(&taskNeedMod)
|
|
|
- if projectIdMap[int64(taskIDs[int(taskID)])] == 1 {
|
|
|
+ if projectIdMap[taskIDs[taskID]] == 1 {
|
|
|
if taskNeedMod.LogisticsStatus == 2 && taskNeedMod.TaskStage == 5 {
|
|
|
db4.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskID).Updates(&gorm_model.YoungeeTaskInfo{LogisticsStatus: 3, TaskStage: 9})
|
|
|
fmt.Println("内容形式为图片的项目 已修改任务状态为待传初稿 及物流状态为已签收")
|
|
|
}
|
|
|
- } else if projectIdMap[int64(taskIDs[int(taskID)])] == 2 {
|
|
|
+ } else if projectIdMap[taskIDs[taskID]] == 2 {
|
|
|
if taskNeedMod.LogisticsStatus == 2 && taskNeedMod.TaskStage == 5 {
|
|
|
db4.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskID).Updates(&gorm_model.YoungeeTaskInfo{LogisticsStatus: 3, TaskStage: 7})
|
|
|
fmt.Println("内容形式为视频的项目 已修改任务状态为待传脚本 及物流状态为已签收")
|
|
|
@@ -353,8 +360,8 @@ func GetAutoReviewTask(contentType int32) error {
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- var projectIds []int64
|
|
|
- projectIdToAutoTaskIdMap := map[int64]int{}
|
|
|
+ var projectIds []string
|
|
|
+ projectIdToAutoTaskIdMap := map[string]int{}
|
|
|
for _, projectInfo := range projectInfos {
|
|
|
projectIds = append(projectIds, projectInfo.ProjectID)
|
|
|
projectIdToAutoTaskIdMap[projectInfo.ProjectID] = int(projectInfo.AutoTaskID)
|
|
|
@@ -379,7 +386,8 @@ func GetAutoReviewTask(contentType int32) error {
|
|
|
dd, _ := time.ParseDuration(conv.MustString(ReviewInMv, "") + "h")
|
|
|
if scriptInfos.AutoAgreeAt.IsZero() {
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
- db3.Model(gorm_model.YounggeeScriptInfo{}).Where("task_id = ?", taskInfo.TaskId).Updates(&gorm_model.YounggeeScriptInfo{AutoAgreeAt: scriptInfos.SubmitAt.Add(dd)})
|
|
|
+ db3.Model(gorm_model.YounggeeScriptInfo{}).Where("task_id = ?", taskInfo.TaskId).
|
|
|
+ Updates(&gorm_model.YounggeeScriptInfo{AutoAgreeAt: scriptInfos.SubmitAt.Add(dd)})
|
|
|
fmt.Println("已添加脚本自动审核时间")
|
|
|
}
|
|
|
}
|
|
|
@@ -395,7 +403,7 @@ func GetAutoReviewTask(contentType int32) error {
|
|
|
return err
|
|
|
}
|
|
|
// 记录其task_id
|
|
|
- var taskIds []int
|
|
|
+ var taskIds []string
|
|
|
for _, scriptInfo := range newScriptInfos {
|
|
|
taskIds = append(taskIds, scriptInfo.TaskID)
|
|
|
}
|
|
|
@@ -421,6 +429,12 @@ func GetAutoReviewTask(contentType int32) error {
|
|
|
log.Println("DB GetAutoReviewTask error in script:", err)
|
|
|
return err
|
|
|
}
|
|
|
+ for _, taskId := range taskIds {
|
|
|
+ err = CreateTaskLog(context.Background(), taskId, "脚本通过")
|
|
|
+ if err != nil {
|
|
|
+ logrus.WithContext(context.Background()).Errorf("[Script service] call CreateTaskLog error,err:%+v", err)
|
|
|
+ }
|
|
|
+ }
|
|
|
if len(taskIds) != 0 {
|
|
|
fmt.Println("以下任务状态需要变更:", taskIds)
|
|
|
fmt.Println("自动审核脚本：已更新taskInfo表，任务阶段为待传链接 及脚本上传状态为已通过")
|
|
|
@@ -433,8 +447,8 @@ func GetAutoReviewTask(contentType int32) error {
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- var projectIds []int64
|
|
|
- projectIdToAutoTaskIdMap := map[int64]int{}
|
|
|
+ var projectIds []string
|
|
|
+ projectIdToAutoTaskIdMap := map[string]int{}
|
|
|
for _, projectInfo := range projectInfos {
|
|
|
projectIds = append(projectIds, projectInfo.ProjectID)
|
|
|
projectIdToAutoTaskIdMap[projectInfo.ProjectID] = int(projectInfo.AutoTaskID)
|
|
|
@@ -473,7 +487,7 @@ func GetAutoReviewTask(contentType int32) error {
|
|
|
return err
|
|
|
}
|
|
|
// 记录其task_id
|
|
|
- var taskIds []int
|
|
|
+ var taskIds []string
|
|
|
for _, sketchInfo := range newSketchInfos {
|
|
|
taskIds = append(taskIds, sketchInfo.TaskID)
|
|
|
}
|
|
|
@@ -499,6 +513,12 @@ func GetAutoReviewTask(contentType int32) error {
|
|
|
log.Println("DB GetAutoReviewTask error in sketch:", err)
|
|
|
return err
|
|
|
}
|
|
|
+ for _, taskId := range taskIds {
|
|
|
+ err = CreateTaskLog(context.Background(), taskId, "初稿通过")
|
|
|
+ if err != nil {
|
|
|
+ logrus.WithContext(context.Background()).Errorf("[Script service] call CreateTaskLog error,err:%+v", err)
|
|
|
+ }
|
|
|
+ }
|
|
|
if len(taskIds) != 0 {
|
|
|
fmt.Println("以下任务状态需要变更:", taskIds)
|
|
|
fmt.Println("自动审核初稿：已更新taskInfo表，任务阶段为待传链接 及初稿上传状态为已通过")
|
|
|
@@ -515,8 +535,8 @@ func GetAutoPostReviewTask() error {
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- var projectIds []int64
|
|
|
- projectIdToAutoTaskIdMap := map[int64]int{}
|
|
|
+ var projectIds []string
|
|
|
+ projectIdToAutoTaskIdMap := map[string]int{}
|
|
|
for _, projectInfo := range projectInfos {
|
|
|
projectIds = append(projectIds, projectInfo.ProjectID)
|
|
|
projectIdToAutoTaskIdMap[projectInfo.ProjectID] = int(projectInfo.AutoTaskID)
|
|
|
@@ -554,7 +574,7 @@ func GetAutoPostReviewTask() error {
|
|
|
return err
|
|
|
}
|
|
|
// 记录其task_id
|
|
|
- var taskIds []int
|
|
|
+ var taskIds []string
|
|
|
for _, linkInfo := range newLinkInfos {
|
|
|
taskIds = append(taskIds, linkInfo.TaskID)
|
|
|
}
|
|
|
@@ -580,6 +600,12 @@ func GetAutoPostReviewTask() error {
|
|
|
log.Println("DB GetAutoPostReviewTask error in link:", err)
|
|
|
return err
|
|
|
}
|
|
|
+ for _, taskId := range taskIds {
|
|
|
+ err = CreateTaskLog(context.Background(), taskId, "链接通过")
|
|
|
+ if err != nil {
|
|
|
+ logrus.WithContext(context.Background()).Errorf("[Script service] call CreateTaskLog error,err:%+v", err)
|
|
|
+ }
|
|
|
+ }
|
|
|
if len(taskIds) != 0 {
|
|
|
fmt.Println("以下任务状态需要变更:", taskIds)
|
|
|
fmt.Println("自动审核链接：已更新taskInfo表，任务阶段为待传链接 及链接上传状态为已通过")
|
|
|
@@ -595,8 +621,8 @@ func GetAutoCaseCloseTask() error {
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- var projectIds []int64
|
|
|
- projectIdToAutoTaskIdMap := map[int64]int{}
|
|
|
+ var projectIds []string
|
|
|
+ projectIdToAutoTaskIdMap := map[string]int{}
|
|
|
for _, projectInfo := range projectInfos {
|
|
|
projectIds = append(projectIds, projectInfo.ProjectID)
|
|
|
projectIdToAutoTaskIdMap[projectInfo.ProjectID] = int(projectInfo.AutoTaskID)
|
|
|
@@ -634,9 +660,9 @@ func GetAutoCaseCloseTask() error {
|
|
|
return err
|
|
|
}
|
|
|
// 记录其task_id
|
|
|
- taskIdToDataInfoMap := map[int]gorm_model.YounggeeDataInfo{}
|
|
|
- taskIdToTaskInfoMap := map[int]gorm_model.YoungeeTaskInfo{}
|
|
|
- var taskIds []int
|
|
|
+ taskIdToDataInfoMap := map[string]gorm_model.YounggeeDataInfo{}
|
|
|
+ taskIdToTaskInfoMap := map[string]gorm_model.YoungeeTaskInfo{}
|
|
|
+ var taskIds []string
|
|
|
db6 := GetReadDB(context.Background())
|
|
|
for _, dataInfo := range newDataInfos {
|
|
|
taskIdToDataInfoMap[dataInfo.TaskID] = dataInfo
|
|
|
@@ -666,11 +692,21 @@ func GetAutoCaseCloseTask() error {
|
|
|
// 2）.更新taskInfo表
|
|
|
db5 := GetReadDB(context.Background())
|
|
|
err = db5.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id in ?", taskIds).Updates(
|
|
|
- &gorm_model.YoungeeTaskInfo{DataStatus: 5, TaskStage: 15}).Error
|
|
|
+ &gorm_model.YoungeeTaskInfo{DataStatus: 5, TaskStage: 15, CompleteDate: time.Now(), CompleteStatus: 2, WithdrawStatus: 2}).Error
|
|
|
if err != nil {
|
|
|
log.Println("DB GetAutoCaseCloseTask error in data:", err)
|
|
|
return err
|
|
|
}
|
|
|
+ for _, taskId := range taskIds {
|
|
|
+ err = CreateTaskLog(context.Background(), taskId, "数据通过")
|
|
|
+ if err != nil {
|
|
|
+ logrus.WithContext(context.Background()).Errorf("[auto] call CreateTaskLog error,err:%+v", err)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ err = SetTalentIncome(context.Background(), taskIds)
|
|
|
+ if err != nil {
|
|
|
+ logrus.WithContext(context.Background()).Errorf("[auto] call SetTalentIncome error,err:%+v", err)
|
|
|
+ }
|
|
|
if len(taskIds) != 0 {
|
|
|
fmt.Println("以下任务状态需要变更:", taskIds)
|
|
|
fmt.Println("自动审核数据：已更新taskInfo表，任务阶段为待传数据 及数据上传状态为已通过")
|
|
|
@@ -684,7 +720,7 @@ func GetAutoCaseCloseTask() error {
|
|
|
db7 := GetReadDB(context.Background())
|
|
|
db7 = db7.Model(gorm_model.RecruitStrategy{}).Where("project_id = ? and strategy_id = ?", taskInfo.ProjectId, taskInfo.StrategyId)
|
|
|
fansCount, _ := strconv.Atoi(conv.MustString(gjson.Get(taskInfo.TalentPlatformInfoSnap, "fans_count"), ""))
|
|
|
- err = db.Updates(map[string]interface{}{
|
|
|
+ err = db7.Updates(map[string]interface{}{
|
|
|
"fan_number": gorm.Expr("fan_number + ?", fansCount),
|
|
|
"play_number": gorm.Expr("play_number + ?", dataInfo.PlayNumber),
|
|
|
"like_number": gorm.Expr("like_number + ?", dataInfo.LikeNumber),
|
|
|
@@ -713,12 +749,6 @@ func GetAutoCaseCloseTask() error {
|
|
|
if unFinishedTaskNumber == 0 && finishedNum != 0 {
|
|
|
// 若为0则触发项目结案
|
|
|
db9 := GetReadDB(context.Background())
|
|
|
- // 1. 更新项目状态为已结束
|
|
|
- err := db9.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectInfo.ProjectID).Updates(map[string]interface{}{"project_status": 10}).Error
|
|
|
- if err != nil {
|
|
|
- log.Println("DB GetAutoCaseCloseTask error in data:", err)
|
|
|
- return err
|
|
|
- }
|
|
|
// 2. 释放企业账户因项目冻结的资金
|
|
|
// 1）. 计算剩余资金
|
|
|
var allPayment float64
|
|
|
@@ -747,6 +777,13 @@ func GetAutoCaseCloseTask() error {
|
|
|
log.Println("DB GetAutoCaseCloseTask error in data:", err)
|
|
|
return err
|
|
|
}
|
|
|
+ // 1. 更新项目状态为已结束
|
|
|
+ err := db9.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectInfo.ProjectID).
|
|
|
+ Updates(map[string]interface{}{"project_status": 10, "payment_amount": realPayment}).Error
|
|
|
+ if err != nil {
|
|
|
+ log.Println("DB GetAutoCaseCloseTask error in data:", err)
|
|
|
+ return err
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return nil
|
|
|
@@ -759,8 +796,8 @@ func GetAutoInvalidTask() error {
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- var projectIds []int64
|
|
|
- projectIdToAutoTaskIdMap := map[int64]int{}
|
|
|
+ var projectIds []string
|
|
|
+ projectIdToAutoTaskIdMap := map[string]int{}
|
|
|
for _, projectInfo := range projectInfos {
|
|
|
projectIds = append(projectIds, projectInfo.ProjectID)
|
|
|
projectIdToAutoTaskIdMap[projectInfo.ProjectID] = int(projectInfo.AutoTaskID)
|
|
|
@@ -787,7 +824,7 @@ func GetAutoInvalidTask() error {
|
|
|
project.RecruitDdl.Add(dd)
|
|
|
t := project.RecruitDdl.Add(dd)
|
|
|
//fmt.Println("已存在的失效时间是否跟要添加的相等", project.AutoFailAt.Equal(t))
|
|
|
- if project.AutoFailAt != &t {
|
|
|
+ if project.AutoFailAt == nil || project.AutoFailAt.IsZero() {
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
db3.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).Updates(&gorm_model.ProjectInfo{AutoFailAt: &t})
|
|
|
fmt.Println("已添加失效自动处理时间")
|
|
|
@@ -797,7 +834,7 @@ func GetAutoInvalidTask() error {
|
|
|
db2 := GetReadDB(context.Background())
|
|
|
db2 = db2.Where("project_id = ?", projectId).First(&projectNeedMod)
|
|
|
fmt.Println("失效自动处理时间为：", projectNeedMod.AutoFailAt)
|
|
|
- if !projectNeedMod.AutoFailAt.IsZero() {
|
|
|
+ if !projectNeedMod.AutoFailAt.IsZero() || projectNeedMod.AutoFailAt != nil {
|
|
|
fmt.Printf("项目 %v 失效自动处理时间不为空\n", projectNeedMod.ProjectID)
|
|
|
fmt.Println("距离失效自动处理时间还有：,项目当前状态为", projectNeedMod.AutoFailAt.Sub(time.Now()), projectNeedMod.ProjectStatus)
|
|
|
if projectNeedMod.AutoFailAt.Sub(time.Now()) <= 0 && projectNeedMod.ProjectStatus < 8 {
|
|
|
@@ -821,13 +858,13 @@ func GetAutoDraftDefaultInPicTask() error {
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- var projectIds []int64
|
|
|
- projectIdToAutoTaskIdMap := map[int64]int{} // 项目id 对 定时任务id 的map
|
|
|
- projectIdToAutoDefaultIdMap := map[int64]int{} // 项目id 对 违约扣款设置id 的map
|
|
|
- taskIdToFeeFormMap := make(map[int]int) // taskId 对 稿费形式的 map
|
|
|
- TaskIdToProjectId := make(map[int]int) // taskId 对 项目id的 map
|
|
|
- var taskNeedModIds []int // 首次提交初稿的任务记录id
|
|
|
- var submitTaskNeedModIds []int // 修改后提交初稿的任务记录id
|
|
|
+ var projectIds []string
|
|
|
+ projectIdToAutoTaskIdMap := map[string]int{} // 项目id 对 定时任务id 的map
|
|
|
+ projectIdToAutoDefaultIdMap := map[string]int{} // 项目id 对 违约扣款设置id 的map
|
|
|
+ taskIdToFeeFormMap := make(map[string]int) // taskId 对 稿费形式的 map
|
|
|
+ TaskIdToProjectId := make(map[string]string) // taskId 对 项目id的 map
|
|
|
+ var taskNeedModIds []string // 首次提交初稿的任务记录id
|
|
|
+ var submitTaskNeedModIds []string // 修改后提交初稿的任务记录id
|
|
|
// 构造map及list
|
|
|
for _, projectInfo := range projectInfos {
|
|
|
projectIds = append(projectIds, projectInfo.ProjectID)
|
|
|
@@ -839,7 +876,7 @@ func GetAutoDraftDefaultInPicTask() error {
|
|
|
var taskInfos []gorm_model.YoungeeTaskInfo
|
|
|
db1.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? AND task_status = ? AND task_stage = ? AND cur_default_type = ?", projectId, 2, 9, 0).Find(&taskInfos)
|
|
|
for _, taskInfo := range taskInfos {
|
|
|
- TaskIdToProjectId[taskInfo.TaskId] = int(projectId)
|
|
|
+ TaskIdToProjectId[taskInfo.TaskId] = projectId
|
|
|
taskNeedMod := gorm_model.YoungeeTaskInfo{}
|
|
|
db2 := GetReadDB(context.Background())
|
|
|
// 保存所有满足物流状态为3 且 初稿上传状态为 1或 3 的任务记录的id
|
|
|
@@ -856,7 +893,7 @@ func GetAutoDraftDefaultInPicTask() error {
|
|
|
// 判断应首次上传初稿的任务
|
|
|
for _, taskNeedModId := range taskNeedModIds {
|
|
|
// 获取 autoTaskId 及其对应的限制时间
|
|
|
- autoTaskId := projectIdToAutoTaskIdMap[int64(TaskIdToProjectId[taskNeedModId])]
|
|
|
+ autoTaskId := projectIdToAutoTaskIdMap[TaskIdToProjectId[taskNeedModId]]
|
|
|
dbStart := GetReadDB(context.Background())
|
|
|
var DraftDefaultInPic int32
|
|
|
dbStart.Model(gorm_model.InfoAutoTask{}).Select("draft_default_in_pic").Where("auto_task_id = ?", autoTaskId).First(&DraftDefaultInPic)
|
|
|
@@ -869,20 +906,21 @@ func GetAutoDraftDefaultInPicTask() error {
|
|
|
var sketchDefaultRate int
|
|
|
if taskIdToFeeFormMap[taskNeedModId] == 1 { // 稿费形式为产品置换
|
|
|
db6 := GetReadDB(context.Background())
|
|
|
- db6.Model(gorm_model.InfoAutoDefaultHandle{}).Select("script_replace_time_out").Where("auto_default_id = ?", projectIdToAutoDefaultIdMap[int64(TaskIdToProjectId[taskNeedModId])]).Find(&sketchDefaultRate)
|
|
|
+ db6.Model(gorm_model.InfoAutoDefaultHandle{}).Select("script_replace_time_out").Where("auto_default_id = ?", projectIdToAutoDefaultIdMap[TaskIdToProjectId[taskNeedModId]]).Find(&sketchDefaultRate)
|
|
|
} else { // 稿费形式为其他
|
|
|
db6 := GetReadDB(context.Background())
|
|
|
- db6.Model(gorm_model.InfoAutoDefaultHandle{}).Select("script_other_time_out").Where("auto_default_id = ?", projectIdToAutoDefaultIdMap[int64(TaskIdToProjectId[taskNeedModId])]).Find(&sketchDefaultRate)
|
|
|
+ db6.Model(gorm_model.InfoAutoDefaultHandle{}).Select("script_other_time_out").Where("auto_default_id = ?", projectIdToAutoDefaultIdMap[TaskIdToProjectId[taskNeedModId]]).Find(&sketchDefaultRate)
|
|
|
}
|
|
|
|
|
|
// 添加初稿违约自动处理时间
|
|
|
- if taskLogisticNeedMod.AutoSketchBreakAt.IsZero() {
|
|
|
+ if taskLogisticNeedMod.AutoSketchBreakAt == nil || taskLogisticNeedMod.AutoSketchBreakAt.IsZero() {
|
|
|
dd, _ := time.ParseDuration(conv.MustString(DraftDefaultInPic, "") + "h")
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
+ t := taskLogisticNeedMod.SignedTime.Add(dd)
|
|
|
db4.Where("task_id = ?", taskNeedModId).Updates(&gorm_model.YoungeeTaskLogistics{
|
|
|
- AutoSketchBreakAt: taskLogisticNeedMod.SignedTime.Add(dd),
|
|
|
+ AutoSketchBreakAt: &t,
|
|
|
})
|
|
|
- taskLogisticNeedMod.AutoSketchBreakAt = taskLogisticNeedMod.SignedTime.Add(dd)
|
|
|
+ taskLogisticNeedMod.AutoSketchBreakAt = &t
|
|
|
fmt.Println("已添加图片初稿违约自动处理时间")
|
|
|
}
|
|
|
|
|
|
@@ -916,17 +954,17 @@ func GetAutoDraftDefaultInPicTask() error {
|
|
|
// 获取 autoTaskId 及其对应的限制时间
|
|
|
db2 := GetReadDB(context.Background())
|
|
|
var DraftDefaultInMv int32
|
|
|
- db2.Model(&gorm_model.InfoAutoTask{}).Select("draft_default_in_mv").Where("auto_task_id = ?", projectIdToAutoTaskIdMap[int64(TaskIdToProjectId[submitTaskNeedModId])]).First(&DraftDefaultInMv)
|
|
|
+ db2.Model(&gorm_model.InfoAutoTask{}).Select("draft_default_in_mv").Where("auto_task_id = ?", projectIdToAutoTaskIdMap[TaskIdToProjectId[submitTaskNeedModId]]).First(&DraftDefaultInMv)
|
|
|
dd, _ := time.ParseDuration(conv.MustString(DraftDefaultInMv, "") + "h")
|
|
|
|
|
|
// 查询违约扣款比例
|
|
|
var sketchDefaultRate int
|
|
|
if taskIdToFeeFormMap[submitTaskNeedModId] == 1 {
|
|
|
db6 := GetReadDB(context.Background())
|
|
|
- db6.Model(gorm_model.InfoAutoDefaultHandle{}).Select("script_replace_time_out").Where("auto_default_id = ?", projectIdToAutoDefaultIdMap[int64(TaskIdToProjectId[submitTaskNeedModId])]).Find(&sketchDefaultRate)
|
|
|
+ db6.Model(gorm_model.InfoAutoDefaultHandle{}).Select("script_replace_time_out").Where("auto_default_id = ?", projectIdToAutoDefaultIdMap[TaskIdToProjectId[submitTaskNeedModId]]).Find(&sketchDefaultRate)
|
|
|
} else {
|
|
|
db6 := GetReadDB(context.Background())
|
|
|
- db6.Model(gorm_model.InfoAutoDefaultHandle{}).Select("script_other_time_out").Where("auto_default_id = ?", projectIdToAutoDefaultIdMap[int64(TaskIdToProjectId[submitTaskNeedModId])]).Find(&sketchDefaultRate)
|
|
|
+ db6.Model(gorm_model.InfoAutoDefaultHandle{}).Select("script_other_time_out").Where("auto_default_id = ?", projectIdToAutoDefaultIdMap[TaskIdToProjectId[submitTaskNeedModId]]).Find(&sketchDefaultRate)
|
|
|
}
|
|
|
// 添加初稿违约自动处理时间
|
|
|
db1 := GetReadDB(context.Background())
|
|
|
@@ -974,20 +1012,20 @@ func GetAutoDraftDefaultInPicTask() error {
|
|
|
// 视频-初稿超时违约判断
|
|
|
func GetAutoDraftDefaultInMvTask() error {
|
|
|
db := GetReadDB(context.Background())
|
|
|
- var VideoProjectIds []int64
|
|
|
+ var VideoProjectIds []string
|
|
|
err := db.Select("project_id").Model(gorm_model.ProjectInfo{}).Where("project_type = ? AND content_type = ? ", 1, 2).Find(&VideoProjectIds).Error
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
// 任务id 对 项目id 的map
|
|
|
- taskIdToProjectIdMap := map[int]int64{}
|
|
|
+ taskIdToProjectIdMap := map[string]string{}
|
|
|
// 项目id 对 定时任务id 的map
|
|
|
- projectIdToAutoTaskIdMap := map[int64]int{}
|
|
|
+ projectIdToAutoTaskIdMap := map[string]int{}
|
|
|
// 项目 id 对 违约定时任务 id 的 map
|
|
|
- projectIdToAutoDefaultIdMap := map[int64]int{}
|
|
|
+ projectIdToAutoDefaultIdMap := map[string]int{}
|
|
|
// taskId 对 稿费形式的 map
|
|
|
- taskIdToFeeFormMap := make(map[int]int)
|
|
|
- var videoTaskIds []int
|
|
|
+ taskIdToFeeFormMap := make(map[string]int)
|
|
|
+ var videoTaskIds []string
|
|
|
|
|
|
// 构造map及list
|
|
|
for _, VideoProjectId := range VideoProjectIds {
|
|
|
@@ -1007,9 +1045,9 @@ func GetAutoDraftDefaultInMvTask() error {
|
|
|
}
|
|
|
}
|
|
|
// 首次提交初稿的任务记录id
|
|
|
- var videoTaskNeedModIds []int
|
|
|
+ var videoTaskNeedModIds []string
|
|
|
// 已提交初稿的任务记录id
|
|
|
- var submitVideoTaskNeedModIds []int
|
|
|
+ var submitVideoTaskNeedModIds []string
|
|
|
for _, videoTaskId := range videoTaskIds {
|
|
|
var taskInfo gorm_model.YoungeeTaskInfo
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
@@ -1049,7 +1087,7 @@ func GetAutoDraftDefaultInMvTask() error {
|
|
|
if taskScriptInfo.AutoSketchBreakAt.Sub(time.Now()) <= 0 {
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
|
|
|
- TaskID: videoTaskNeedModId, ProjectID: int(taskIdToProjectIdMap[videoTaskNeedModId]), BreakType: 2, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
+ TaskID: videoTaskNeedModId, ProjectID: taskIdToProjectIdMap[videoTaskNeedModId], BreakType: 2, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
if err1 != nil {
|
|
|
return err1
|
|
|
}
|
|
|
@@ -1061,7 +1099,7 @@ func GetAutoDraftDefaultInMvTask() error {
|
|
|
}
|
|
|
settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.LinkBreakRate+taskInfo.DataBreakRate+sketchDefaultRate+taskInfo.ScriptBreakRate)/100)
|
|
|
if settleAmount < 0 {
|
|
|
- settleAmount = float64(0.01)
|
|
|
+ settleAmount = 0.01
|
|
|
}
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", videoTaskNeedModId).Updates(
|
|
|
@@ -1101,7 +1139,7 @@ func GetAutoDraftDefaultInMvTask() error {
|
|
|
if taskSketchInfo.AutoSketchBreakAt.Sub(time.Now()) <= 0 {
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
|
|
|
- TaskID: submitVideoTaskNeedModId, ProjectID: int(taskIdToProjectIdMap[submitVideoTaskNeedModId]), BreakType: 2, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
+ TaskID: submitVideoTaskNeedModId, ProjectID: taskIdToProjectIdMap[submitVideoTaskNeedModId], BreakType: 2, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
if err1 != nil {
|
|
|
return err1
|
|
|
}
|
|
|
@@ -1113,7 +1151,7 @@ func GetAutoDraftDefaultInMvTask() error {
|
|
|
}
|
|
|
settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.LinkBreakRate+taskInfo.DataBreakRate+sketchDefaultRate+taskInfo.ScriptBreakRate)/100)
|
|
|
if settleAmount < 0 {
|
|
|
- settleAmount = float64(0.01)
|
|
|
+ settleAmount = 0.01
|
|
|
}
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", submitVideoTaskNeedModId).Updates(
|
|
|
@@ -1129,24 +1167,24 @@ func GetAutoDraftDefaultInMvTask() error {
|
|
|
|
|
|
func GetAutoScriptDefaultTask() error {
|
|
|
db := GetReadDB(context.Background())
|
|
|
- var VideoProjectIds []int64
|
|
|
+ var VideoProjectIds []string
|
|
|
err := db.Select("project_id").Model(gorm_model.ProjectInfo{}).Where("project_type = ? AND content_type = ?", 1, 2).Find(&VideoProjectIds).Error
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
// 任务id 对 项目id 的map
|
|
|
- taskIdToProjectIdMap := map[int]int64{}
|
|
|
+ taskIdToProjectIdMap := map[string]string{}
|
|
|
// 项目id 对 定时任务id 的map
|
|
|
- projectIdToAutoTaskIdMap := map[int64]int{}
|
|
|
+ projectIdToAutoTaskIdMap := map[string]int{}
|
|
|
// 项目id 对 违约定时任务id 的map
|
|
|
- projectIdToAutoDefaultIdMap := map[int64]int{}
|
|
|
+ projectIdToAutoDefaultIdMap := map[string]int{}
|
|
|
// taskId 对 稿费形式的 map
|
|
|
- taskIdToFeeFormMap := make(map[int]int)
|
|
|
+ taskIdToFeeFormMap := make(map[string]int)
|
|
|
// 首次提交脚本的任务记录id
|
|
|
- var videoTaskNeedModIds []int
|
|
|
+ var videoTaskNeedModIds []string
|
|
|
// 已提交脚本的任务记录id
|
|
|
- var submitVideoTaskNeedModIds []int
|
|
|
- var videoTaskIds []int
|
|
|
+ var submitVideoTaskNeedModIds []string
|
|
|
+ var videoTaskIds []string
|
|
|
// 构造map及list
|
|
|
for _, VideoProjectId := range VideoProjectIds {
|
|
|
db2 := GetReadDB(context.Background())
|
|
|
@@ -1192,13 +1230,14 @@ func GetAutoScriptDefaultTask() error {
|
|
|
db6 := GetReadDB(context.Background())
|
|
|
db6.Model(gorm_model.InfoAutoDefaultHandle{}).Select("script_other_time_out").Where("auto_default_id = ?", projectIdToAutoDefaultIdMap[taskIdToProjectIdMap[videoTaskNeedModId]]).Find(&scriptDefaultRate)
|
|
|
}
|
|
|
- if taskLogisticInfo.AutoScriptBreakAt.IsZero() {
|
|
|
- db1.Where("task_id = ?", videoTaskNeedModId).Updates(&gorm_model.YoungeeTaskLogistics{AutoScriptBreakAt: taskLogisticInfo.SignedTime.Add(dd)})
|
|
|
+ if taskLogisticInfo.AutoScriptBreakAt == nil || taskLogisticInfo.AutoScriptBreakAt.IsZero() {
|
|
|
+ t := taskLogisticInfo.SignedTime.Add(dd)
|
|
|
+ db1.Where("task_id = ?", videoTaskNeedModId).Updates(&gorm_model.YoungeeTaskLogistics{AutoScriptBreakAt: &t})
|
|
|
fmt.Println("已添加视频形式的脚本违约自动处理时间")
|
|
|
if taskLogisticInfo.SignedTime.Add(dd).Sub(time.Now()) <= 0 {
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
|
|
|
- TaskID: videoTaskNeedModId, ProjectID: int(taskIdToProjectIdMap[videoTaskNeedModId]), BreakType: 1, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
+ TaskID: videoTaskNeedModId, ProjectID: taskIdToProjectIdMap[videoTaskNeedModId], BreakType: 1, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
if err1 != nil {
|
|
|
return err1
|
|
|
}
|
|
|
@@ -1224,7 +1263,7 @@ func GetAutoScriptDefaultTask() error {
|
|
|
if taskLogisticInfo.AutoScriptBreakAt.Sub(time.Now()) <= 0 {
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
|
|
|
- TaskID: videoTaskNeedModId, ProjectID: int(taskIdToProjectIdMap[videoTaskNeedModId]), BreakType: 1, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
+ TaskID: videoTaskNeedModId, ProjectID: taskIdToProjectIdMap[videoTaskNeedModId], BreakType: 1, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
if err1 != nil {
|
|
|
return err1
|
|
|
}
|
|
|
@@ -1236,7 +1275,7 @@ func GetAutoScriptDefaultTask() error {
|
|
|
}
|
|
|
settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.SketchBreakRate+taskInfo.DataBreakRate+taskInfo.LinkBreakRate+scriptDefaultRate)/100)
|
|
|
if settleAmount < 0 {
|
|
|
- settleAmount = float64(0.01)
|
|
|
+ settleAmount = 0.01
|
|
|
}
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", videoTaskNeedModId).Updates(
|
|
|
@@ -1274,7 +1313,7 @@ func GetAutoScriptDefaultTask() error {
|
|
|
if taskScriptInfo.RejectAt.Add(dd).Sub(time.Now()) <= 0 {
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
|
|
|
- TaskID: submitVideoTaskNeedModId, ProjectID: int(taskIdToProjectIdMap[submitVideoTaskNeedModId]), BreakType: 1, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
+ TaskID: submitVideoTaskNeedModId, ProjectID: taskIdToProjectIdMap[submitVideoTaskNeedModId], BreakType: 1, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
if err1 != nil {
|
|
|
return err1
|
|
|
}
|
|
|
@@ -1286,7 +1325,7 @@ func GetAutoScriptDefaultTask() error {
|
|
|
}
|
|
|
settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.SketchBreakRate+taskInfo.DataBreakRate+taskInfo.LinkBreakRate+scriptDefaultRate)/100)
|
|
|
if settleAmount < 0 {
|
|
|
- settleAmount = float64(0.01)
|
|
|
+ settleAmount = 0.01
|
|
|
}
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
err3 := db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", submitVideoTaskNeedModId).Updates(&gorm_model.YoungeeTaskInfo{
|
|
|
@@ -1300,7 +1339,7 @@ func GetAutoScriptDefaultTask() error {
|
|
|
if taskScriptInfo.AutoScriptBreakAt.Sub(time.Now()) <= 0 {
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
|
|
|
- TaskID: submitVideoTaskNeedModId, ProjectID: int(taskIdToProjectIdMap[submitVideoTaskNeedModId]), BreakType: 1, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
+ TaskID: submitVideoTaskNeedModId, ProjectID: taskIdToProjectIdMap[submitVideoTaskNeedModId], BreakType: 1, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
if err1 != nil {
|
|
|
return err1
|
|
|
}
|
|
|
@@ -1329,21 +1368,20 @@ func GetAutoScriptDefaultTask() error {
|
|
|
|
|
|
func GetAutoLinkBreachTask() error {
|
|
|
db := GetReadDB(context.Background())
|
|
|
- var projectIds []int64
|
|
|
+ var projectIds []string
|
|
|
err := db.Select("project_id").Model(gorm_model.ProjectInfo{}).Where("project_type = ?", 1).Find(&projectIds).Error
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- //fmt.Println("projectIds:", projectIds)
|
|
|
// 任务id 对 项目id 的map
|
|
|
- taskIdToProjectIdMap := map[int]int64{}
|
|
|
+ taskIdToProjectIdMap := map[string]string{}
|
|
|
// 项目id 对 定时任务id 的map
|
|
|
- projectIdToAutoTaskIdMap := map[int64]int{}
|
|
|
+ projectIdToAutoTaskIdMap := map[string]int{}
|
|
|
// 项目id 对 违约定时任务id 的map
|
|
|
- projectIdToAutoDefaultIdMap := map[int64]int{}
|
|
|
- var taskIds []int
|
|
|
+ projectIdToAutoDefaultIdMap := map[string]int{}
|
|
|
+ var taskIds []string
|
|
|
// taskId 对 稿费形式的 map
|
|
|
- taskIdToFeeFormMap := make(map[int]int)
|
|
|
+ taskIdToFeeFormMap := make(map[string]int)
|
|
|
for _, projectId := range projectIds {
|
|
|
db2 := GetReadDB(context.Background())
|
|
|
autoIds := gorm_model.ProjectInfo{}
|
|
|
@@ -1359,12 +1397,10 @@ func GetAutoLinkBreachTask() error {
|
|
|
taskIdToFeeFormMap[taskInfo.TaskId] = taskInfo.FeeForm
|
|
|
}
|
|
|
}
|
|
|
- //fmt.Println("taskIdToProjectIdMap:", taskIdToProjectIdMap)
|
|
|
- //fmt.Println("taskIds:", taskIds)
|
|
|
// 首次提交链接的任务记录id
|
|
|
- var taskNeedModIds []int
|
|
|
+ var taskNeedModIds []string
|
|
|
// 已提交链接的任务记录id
|
|
|
- var submitTaskNeedModIds []int
|
|
|
+ var submitTaskNeedModIds []string
|
|
|
for _, taskId := range taskIds {
|
|
|
var taskInfo gorm_model.YoungeeTaskInfo
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
@@ -1378,8 +1414,6 @@ func GetAutoLinkBreachTask() error {
|
|
|
submitTaskNeedModIds = append(submitTaskNeedModIds, taskId)
|
|
|
}
|
|
|
}
|
|
|
- //fmt.Println("taskNeedModIds:", taskNeedModIds)
|
|
|
- //fmt.Println("submitTaskNeedModIds:", submitTaskNeedModIds)
|
|
|
for _, taskNeedModId := range taskNeedModIds {
|
|
|
db2 := GetReadDB(context.Background())
|
|
|
var linkBreach int32
|
|
|
@@ -1402,7 +1436,7 @@ func GetAutoLinkBreachTask() error {
|
|
|
if taskSketchInfo.AgreeAt.Add(dd).Sub(time.Now()) <= 0 {
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
|
|
|
- TaskID: taskNeedModId, ProjectID: int(taskIdToProjectIdMap[taskNeedModId]), BreakType: 3, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
+ TaskID: taskNeedModId, ProjectID: taskIdToProjectIdMap[taskNeedModId], BreakType: 3, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
if err1 != nil {
|
|
|
return err1
|
|
|
}
|
|
|
@@ -1414,7 +1448,7 @@ func GetAutoLinkBreachTask() error {
|
|
|
}
|
|
|
settleAmount := taskInfo.TaskReward * (1.0 - float64(linkDefaultRate+taskInfo.DataBreakRate+taskInfo.SketchBreakRate+taskInfo.ScriptBreakRate)/100)
|
|
|
if settleAmount < 0 {
|
|
|
- settleAmount = float64(0.01)
|
|
|
+ settleAmount = 0.01
|
|
|
}
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskNeedModId).Updates(
|
|
|
@@ -1428,7 +1462,7 @@ func GetAutoLinkBreachTask() error {
|
|
|
if taskSketchInfo.AutoLinkBreakAt.Sub(time.Now()) <= 0 {
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
|
|
|
- TaskID: taskNeedModId, ProjectID: int(taskIdToProjectIdMap[taskNeedModId]), BreakType: 3, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
+ TaskID: taskNeedModId, ProjectID: taskIdToProjectIdMap[taskNeedModId], BreakType: 3, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
if err1 != nil {
|
|
|
return err1
|
|
|
}
|
|
|
@@ -1440,7 +1474,7 @@ func GetAutoLinkBreachTask() error {
|
|
|
}
|
|
|
settleAmount := taskInfo.TaskReward * (1.0 - float64(linkDefaultRate+taskInfo.DataBreakRate+taskInfo.SketchBreakRate+taskInfo.ScriptBreakRate)/100)
|
|
|
if settleAmount < 0 {
|
|
|
- settleAmount = float64(0.01)
|
|
|
+ settleAmount = 0.01
|
|
|
}
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskNeedModId).Updates(
|
|
|
@@ -1478,7 +1512,7 @@ func GetAutoLinkBreachTask() error {
|
|
|
if taskLinkInfo.RejectAt.Add(dd).Sub(time.Now()) <= 0 {
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
|
|
|
- TaskID: submitTaskNeedModId, ProjectID: int(taskIdToProjectIdMap[submitTaskNeedModId]), BreakType: 3, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
+ TaskID: submitTaskNeedModId, ProjectID: taskIdToProjectIdMap[submitTaskNeedModId], BreakType: 3, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
if err1 != nil {
|
|
|
return err1
|
|
|
}
|
|
|
@@ -1490,7 +1524,7 @@ func GetAutoLinkBreachTask() error {
|
|
|
}
|
|
|
settleAmount := taskInfo.TaskReward * (1.0 - float64(linkDefaultRate+taskInfo.DataBreakRate+taskInfo.SketchBreakRate+taskInfo.ScriptBreakRate)/100)
|
|
|
if settleAmount < 0 {
|
|
|
- settleAmount = float64(0.01)
|
|
|
+ settleAmount = 0.01
|
|
|
}
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", submitTaskNeedModId).Updates(
|
|
|
@@ -1504,7 +1538,7 @@ func GetAutoLinkBreachTask() error {
|
|
|
if taskLinkInfo.AutoLinkBreakAt.Sub(time.Now()) <= 0 {
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
|
|
|
- TaskID: submitTaskNeedModId, ProjectID: int(taskIdToProjectIdMap[submitTaskNeedModId]), BreakType: 3, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
+ TaskID: submitTaskNeedModId, ProjectID: taskIdToProjectIdMap[submitTaskNeedModId], BreakType: 3, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
if err1 != nil {
|
|
|
return err1
|
|
|
}
|
|
|
@@ -1533,43 +1567,38 @@ func GetAutoLinkBreachTask() error {
|
|
|
|
|
|
func GetAutoCaseCloseDefaultTask() error {
|
|
|
db := GetReadDB(context.Background())
|
|
|
- var projectIds []int64
|
|
|
+ var projectIds []string
|
|
|
err := db.Select("project_id").Model(gorm_model.ProjectInfo{}).Where("project_type = ?", 1).Find(&projectIds).Error
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- //fmt.Println("projectIds:", projectIds)
|
|
|
// 任务id 对 项目id 的map
|
|
|
- taskIdToProjectIdMap := map[int]int64{}
|
|
|
+ taskIdToProjectIdMap := map[string]string{}
|
|
|
// 项目id 对 定时任务id 的map
|
|
|
- projectIdToAutoTaskIdMap := map[int64]int{}
|
|
|
+ projectIdToAutoTaskIdMap := map[string]int{}
|
|
|
// 项目id 对 违约定时任务id 的map
|
|
|
- projectIdToAutoDefaultIdMap := map[int64]int{}
|
|
|
- var taskIds []int
|
|
|
+ projectIdToAutoDefaultIdMap := map[string]int{}
|
|
|
+ var taskIds []string
|
|
|
for _, projectId := range projectIds {
|
|
|
db2 := GetReadDB(context.Background())
|
|
|
autoIds := gorm_model.ProjectInfo{}
|
|
|
db2.Select([]string{"auto_task_id", "auto_default_id"}).Model(&gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).First(&autoIds)
|
|
|
projectIdToAutoTaskIdMap[projectId] = int(autoIds.AutoTaskID)
|
|
|
projectIdToAutoDefaultIdMap[projectId] = int(autoIds.AutoDefaultID)
|
|
|
- var taskInfos []int32
|
|
|
+ var taskInfos []string
|
|
|
db1 := GetReadDB(context.Background())
|
|
|
db1.Select("task_id").Model(&gorm_model.YoungeeTaskInfo{}).Where("project_id = ? AND task_status = ? AND task_stage = ? AND cur_default_type = ? ", projectId, 2, 13, 0).Find(&taskInfos)
|
|
|
for _, taskInfo := range taskInfos {
|
|
|
- taskIdToProjectIdMap[int(taskInfo)] = projectId
|
|
|
- taskIds = append(taskIds, int(taskInfo))
|
|
|
+ taskIdToProjectIdMap[taskInfo] = projectId
|
|
|
+ taskIds = append(taskIds, taskInfo)
|
|
|
}
|
|
|
}
|
|
|
- //fmt.Println("projectIdToAutoTaskIdMap:", projectIdToAutoTaskIdMap)
|
|
|
- //fmt.Println("projectIdToAutoDefaultIdMap:", projectIdToAutoDefaultIdMap)
|
|
|
- //fmt.Println("taskIdToProjectIdMap:", taskIdToProjectIdMap)
|
|
|
- //fmt.Println("taskIds:", taskIds)
|
|
|
// 首次提交链接的任务记录id
|
|
|
- var taskNeedModIds []int
|
|
|
+ var taskNeedModIds []string
|
|
|
// 已提交链接的任务记录id
|
|
|
- var submitTaskNeedModIds []int
|
|
|
+ var submitTaskNeedModIds []string
|
|
|
// taskId 对 稿费形式的 map
|
|
|
- taskIdToFeeFormMap := make(map[int]int)
|
|
|
+ taskIdToFeeFormMap := make(map[string]int)
|
|
|
for _, taskId := range taskIds {
|
|
|
var taskInfo gorm_model.YoungeeTaskInfo
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
@@ -1584,9 +1613,6 @@ func GetAutoCaseCloseDefaultTask() error {
|
|
|
}
|
|
|
taskIdToFeeFormMap[taskId] = taskInfo.FeeForm
|
|
|
}
|
|
|
- //fmt.Println("taskIdToFeeFormMap:", taskIdToFeeFormMap)
|
|
|
- //fmt.Println("taskNeedModIds:", taskNeedModIds)
|
|
|
- //fmt.Println("submitTaskNeedModIds:", submitTaskNeedModIds)
|
|
|
for _, taskNeedModId := range taskNeedModIds {
|
|
|
db2 := GetReadDB(context.Background())
|
|
|
var CaseCloseDefault int32
|
|
|
@@ -1610,7 +1636,7 @@ func GetAutoCaseCloseDefaultTask() error {
|
|
|
if taskLinkInfo.AgreeAt.Add(dd).Sub(time.Now()) <= 0 {
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
|
|
|
- TaskID: taskNeedModId, ProjectID: int(taskIdToProjectIdMap[taskNeedModId]), BreakType: 4, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
+ TaskID: taskNeedModId, ProjectID: taskIdToProjectIdMap[taskNeedModId], BreakType: 4, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
if err1 != nil {
|
|
|
return err1
|
|
|
}
|
|
|
@@ -1622,7 +1648,7 @@ func GetAutoCaseCloseDefaultTask() error {
|
|
|
}
|
|
|
settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.SketchBreakRate+dataDefaultRate+taskInfo.LinkBreakRate+taskInfo.ScriptBreakRate)/100)
|
|
|
if settleAmount < 0 {
|
|
|
- settleAmount = float64(0.01)
|
|
|
+ settleAmount = 0.01
|
|
|
}
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskNeedModId).Updates(
|
|
|
@@ -1636,7 +1662,7 @@ func GetAutoCaseCloseDefaultTask() error {
|
|
|
if taskLinkInfo.AutoDataBreakAt.Sub(time.Now()) <= 0 {
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
|
|
|
- TaskID: taskNeedModId, ProjectID: int(taskIdToProjectIdMap[taskNeedModId]), BreakType: 4, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
+ TaskID: taskNeedModId, ProjectID: taskIdToProjectIdMap[taskNeedModId], BreakType: 4, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
if err1 != nil {
|
|
|
return err1
|
|
|
}
|
|
|
@@ -1687,7 +1713,7 @@ func GetAutoCaseCloseDefaultTask() error {
|
|
|
if taskDataInfo.RejectAt.Add(dd).Sub(time.Now()) <= 0 {
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
|
|
|
- TaskID: submitTaskNeedModId, ProjectID: int(taskIdToProjectIdMap[submitTaskNeedModId]), BreakType: 4, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
+ TaskID: submitTaskNeedModId, ProjectID: taskIdToProjectIdMap[submitTaskNeedModId], BreakType: 4, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
if err1 != nil {
|
|
|
return err1
|
|
|
}
|
|
|
@@ -1699,7 +1725,7 @@ func GetAutoCaseCloseDefaultTask() error {
|
|
|
}
|
|
|
settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.SketchBreakRate+dataDefaultRate+taskInfo.LinkBreakRate+taskInfo.ScriptBreakRate)/100)
|
|
|
if settleAmount < 0 {
|
|
|
- settleAmount = float64(0.01)
|
|
|
+ settleAmount = 0.01
|
|
|
}
|
|
|
db3 := GetReadDB(context.Background())
|
|
|
err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", submitTaskNeedModId).Updates(
|
|
|
@@ -1713,7 +1739,7 @@ func GetAutoCaseCloseDefaultTask() error {
|
|
|
if taskDataInfo.AutoDataBreakAt.Sub(time.Now()) <= 0 {
|
|
|
db4 := GetReadDB(context.Background())
|
|
|
err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
|
|
|
- TaskID: submitTaskNeedModId, ProjectID: int(taskIdToProjectIdMap[submitTaskNeedModId]), BreakType: 4, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
+ TaskID: submitTaskNeedModId, ProjectID: taskIdToProjectIdMap[submitTaskNeedModId], BreakType: 4, BreakAt: time.Now(), DefaultStatus: 1}).Error
|
|
|
if err1 != nil {
|
|
|
return err1
|
|
|
}
|
yuliang1112