修复消息bug，重构指派任务逻辑

@@ -93,16 +93,9 @@ func (subscriber *NotificationHandleSubscriber) HandleEvent(domainEvent coreDoma
 		if notification, err := notificationRepository.Save(notification); err != nil {
 		if notification, err := notificationRepository.Save(notification); err != nil {
 			return err
 			return err
 		} else {
 		} else {
-			var receiver *domain.EmployeeInfo
-			if taskRejectedEvent.TaskType == domain.TASK_TYPE_ROB {
-				receiver = taskRejectedEvent.RobInfo.Receiver
-			}
-			if taskRejectedEvent.TaskType == domain.TASK_TYPE_BID {
-				receiver = taskRejectedEvent.BidInfo.SuccessfulBidder
-			}
 			sentNotification := &domain.SentNotification{
 			sentNotification := &domain.SentNotification{
 				Notification: notification,
 				Notification: notification,
-				Receiver:     receiver,
+				Receiver:     taskRejectedEvent.BeRejectedPerson,
 				IsRead:       false,
 				IsRead:       false,
 				ReadTime:     time.Time{},
 				ReadTime:     time.Time{},
 			}
 			}

@@ -132,7 +132,7 @@ func (notificationService *NotificationService) SystemNotificationNearBidEndTime
 	} else {
 	} else {
 		taskDao = value
 		taskDao = value
 	}
 	}
-	if tasks, err := taskDao.ListNearThePlannedCompletionTimeTask(); err != nil {
+	if tasks, err := taskDao.ListNearBidEndTimeTask(); err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	} else {
 	} else {
 		for _, task := range tasks {
 		for _, task := range tasks {

@@ -21,12 +21,10 @@ type TaskRejected struct {
 	Sponsor *domain.EmployeeInfo `json:"sponsor"`
 	Sponsor *domain.EmployeeInfo `json:"sponsor"`
 	// 任务状态
 	// 任务状态
 	TaskStatus int `json:"taskStatus"`
 	TaskStatus int `json:"taskStatus"`
-	// 抢单任务信息
-	RobInfo *domain.RobInfo `json:"robInfo"`
-	// 竞标任务信息
-	BidInfo *domain.BidInfo `json:"bidInfo"`
 	//驳回任务记录
 	//驳回任务记录
 	RejectTaskRecord *domain.RejectTaskRecord
 	RejectTaskRecord *domain.RejectTaskRecord
+	//被驳回人
+	BeRejectedPerson *domain.EmployeeInfo `json:"beRejectedPerson"`
 }
 }
 
 
 func (event *TaskRejected) EventType() string {
 func (event *TaskRejected) EventType() string {

@@ -165,8 +165,10 @@ func (status *UnReleasedStatus) Update(task *Task, data map[string]interface{})
 }
 }
 
 
 func (status *UnReleasedStatus) Release(task *Task) error {
 func (status *UnReleasedStatus) Release(task *Task) error {
-	task.ReleaseTime = time.Now()
+	currentTime := time.Now()
+	task.ReleaseTime = currentTime
 	if task.TaskType == TASK_TYPE_DESIGNATE {
 	if task.TaskType == TASK_TYPE_DESIGNATE {
+		task.ReceiveTime = currentTime
 		task.TaskStatus = TASK_STATUS_UNDERWAY
 		task.TaskStatus = TASK_STATUS_UNDERWAY
 		task.CurrentStatus = &UnderwayStatus{}
 		task.CurrentStatus = &UnderwayStatus{}
 	} else {
 	} else {

@@ -62,9 +62,7 @@ func (service *RejectTaskReceiverService) Reject(taskId int64, operatorUid int64
 	if operator.EmployeeInfo.Uid != task.Sponsor.Uid {
 	if operator.EmployeeInfo.Uid != task.Sponsor.Uid {
 		return nil, fmt.Errorf("无效的任务发布者")
 		return nil, fmt.Errorf("无效的任务发布者")
 	}
 	}
-	if err := task.RejectReceiver(); err != nil {
-		return nil, err
-	}
+	var beRejectedPerson *domain.EmployeeInfo
 	newRejectTaskRecord := &domain.RejectTaskRecord{
 	newRejectTaskRecord := &domain.RejectTaskRecord{
 		Task:         task,
 		Task:         task,
 		Operator:     operator.EmployeeInfo,
 		Operator:     operator.EmployeeInfo,
@@ -72,11 +70,17 @@ func (service *RejectTaskReceiverService) Reject(taskId int64, operatorUid int64
 		CreateTime:   time.Now(),
 		CreateTime:   time.Now(),
 	}
 	}
 	if task.TaskType == domain.TASK_TYPE_ROB {
 	if task.TaskType == domain.TASK_TYPE_ROB {
+		if  task.RobInfo != nil &&  task.RobInfo.Receiver != nil{
+			beRejectedPerson = task.RobInfo.Receiver
+		}
 		if err := taskDao.DeleteRobInfo(taskId); err != nil {
 		if err := taskDao.DeleteRobInfo(taskId); err != nil {
 			return nil, err
 			return nil, err
 		}
 		}
 	}
 	}
 	if task.TaskType == domain.TASK_TYPE_BID {
 	if task.TaskType == domain.TASK_TYPE_BID {
+		if task.BidInfo != nil && task.BidInfo.SuccessfulBidder != nil{
+			beRejectedPerson = task.BidInfo.SuccessfulBidder
+		}
 		if err := taskDao.CancelSuccessfulBidder(taskId); err != nil {
 		if err := taskDao.CancelSuccessfulBidder(taskId); err != nil {
 			return nil, err
 			return nil, err
 		}
 		}
@@ -86,6 +90,9 @@ func (service *RejectTaskReceiverService) Reject(taskId int64, operatorUid int64
 	} else {
 	} else {
 		newRejectTaskRecord = rejectTaskRecord
 		newRejectTaskRecord = rejectTaskRecord
 	}
 	}
+	if err := task.RejectReceiver(); err != nil {
+		return nil, err
+	}
 	if task, err := taskRepository.Save(task); err != nil {
 	if task, err := taskRepository.Save(task); err != nil {
 		return nil, err
 		return nil, err
 	} else {
 	} else {
@@ -97,8 +104,7 @@ func (service *RejectTaskReceiverService) Reject(taskId int64, operatorUid int64
 		taskRejectedEvent.TaskType = task.TaskType
 		taskRejectedEvent.TaskType = task.TaskType
 		taskRejectedEvent.Sponsor = task.Sponsor
 		taskRejectedEvent.Sponsor = task.Sponsor
 		taskRejectedEvent.TaskStatus = task.TaskStatus
 		taskRejectedEvent.TaskStatus = task.TaskStatus
-		taskRejectedEvent.RobInfo = task.RobInfo
-		taskRejectedEvent.BidInfo = task.BidInfo
+		taskRejectedEvent.BeRejectedPerson = beRejectedPerson
 		taskRejectedEvent.RejectTaskRecord = newRejectTaskRecord
 		taskRejectedEvent.RejectTaskRecord = newRejectTaskRecord
 		if err := service.Publish(taskRejectedEvent); err != nil {
 		if err := service.Publish(taskRejectedEvent); err != nil {
 			return nil, err
 			return nil, err