作者 陈志颖

fix:修复获取任务返回素币奖励范围值问题

... ... @@ -103,6 +103,8 @@ func (dto *TaskDto) LoadDto(task *domain.Task, projectBelongMap map[int]*domain.
}
}
dto.SuMoney = task.SuMoney
dto.MinSuMoney = task.MinSuMoney
dto.MaxSuMoney = task.MaxSuMoney
dto.AcceptanceStandard = task.AcceptanceStandard
dto.TaskDescription = task.TaskDescription
dto.TaskPictureUrls = task.TaskPictureUrls
... ...
... ... @@ -1000,9 +1000,9 @@ func (taskService *TaskService) GetTask(getTaskQuery *query.GetTaskQuery) (inter
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
}
// 返回任务素币奖励范围
if taskDto.TaskStatus != 5 && taskDto.MinSuMoney == 0 && taskDto.MaxSuMoney == 0 {
if taskDto.TaskStatus != 5 && task.MinSuMoney == 0 && task.MaxSuMoney == 0 {
taskDto.MinSuMoney = 0
taskDto.MaxSuMoney = taskDto.SuMoney
taskDto.MaxSuMoney = task.SuMoney
}
return taskDto, nil
}
... ...
... ... @@ -165,6 +165,7 @@ func (dao *TaskDao) CalculatePersonTask(uid int64) (map[string]interface{}, erro
var completedAsSponsor int64
var bidAsParticipator int64
var completedAsParticipator int64
var expiredAsSponsor int64
tx := dao.transactionContext.PgTx
taskModel := new(models.Task)
if count, err := tx.Model(taskModel).
... ... @@ -287,6 +288,8 @@ func (dao *TaskDao) CalculatePersonTask(uid int64) (map[string]interface{}, erro
} else {
completedAsParticipator = int64(count)
}
//if count, err := tx.Model(taskModel).
// Where(`task.sponsor @> '{}'`)
return map[string]interface{}{
"underwayAsAssignedPerson": underwayAsAssignedPerson,
"unAcceptanceAsAssignedPerson": unAcceptanceAsAssignedPerson,
... ... @@ -303,6 +306,7 @@ func (dao *TaskDao) CalculatePersonTask(uid int64) (map[string]interface{}, erro
"completedAsSponsor": completedAsSponsor,
"bidAsParticipator": bidAsParticipator,
"completedAsParticipator": completedAsParticipator,
"expiredAsSponsor": expiredAsSponsor,
}, nil
}
... ...
... ... @@ -318,6 +318,8 @@ func (repository *TaskRepository) transformPgModelToDomainModel(taskModel *model
CustomerValues: taskModel.CustomerValues,
TaskNature: taskModel.TaskNature,
SuMoney: taskModel.SuMoney,
MinSuMoney: taskModel.MinSuMoney,
MaxSuMoney: taskModel.MaxSuMoney,
AcceptanceStandard: taskModel.AcceptanceStandard,
TaskDescription: taskModel.TaskDescription,
TaskPictureUrls: taskModel.TaskPictureUrls,
... ...