fix_结束任务

app/controller/task_controller.go

@@ -207,6 +207,26 @@ func (t TaskController) SelectionDel(c *gin.Context) {
 	returnSuccess(c, 20000, resultMap)
 }
 
+// 结束带货任务
+func (t TaskController) SelectionClose(c *gin.Context) {
+	param := &vo.SelectionSearchParam{}
+	err := c.BindJSON(param)
+	if err != nil {
+		logrus.Errorf("Request bind err:%+v\n", err)
+		returnError(c, 40000, "Parameter Error: "+err.Error())
+		return
+	}
+	selectionId, err := service.SelectionInfoService{}.CloseSelection(param.SelectionId)
+	if err != nil {
+		logrus.Errorf("[CloseSelection] call CloseSelection err:%+v\n", err)
+		returnError(c, 40000, err.Error())
+		return
+	}
+	resultMap := make(map[string]string)
+	resultMap["selectionId"] = *selectionId
+	returnSuccess(c, 20000, resultMap)
+}
+
 // 创建种草任务
 func (t TaskController) CreateProject(c *gin.Context) {
 	data := &vo.ProjectCreateParam{}
@@ -369,6 +389,26 @@ func (t TaskController) ProjectDel(c *gin.Context) {
 	returnSuccess(c, 20000, resultMap)
 }
 
+// 结束种草任务
+func (t TaskController) ProjectClose(c *gin.Context) {
+	param := &vo.ProjectSearchParam{}
+	err := c.BindJSON(param)
+	if err != nil {
+		logrus.Errorf("Request bind err:%+v\n", err)
+		returnError(c, 40000, "Parameter Error: "+err.Error())
+		return
+	}
+	projectId, err := service.ProjectService{}.CloseProject(param.ProjectId)
+	if err != nil {
+		logrus.Errorf("[CloseProject] call CloseProject err:%+v\n", err)
+		returnError(c, 40000, err.Error())
+		return
+	}
+	resultMap := make(map[string]string)
+	resultMap["projectId"] = *projectId
+	returnSuccess(c, 20000, resultMap)
+}
+
 // 草稿箱——电商带货
 func (t TaskController) GetSelectionDraftList(c *gin.Context) {
 	param := &vo.SelectionDraftParam{}
@@ -812,7 +852,7 @@ func (t TaskController) LogisticsTalentList(c *gin.Context) {
 	}
 	res, err := service.TaskInfoService{}.LogisticsTalentList(param)
 	if err != nil {
-		logrus.Errorf("[LogisticsTalentList] call Show err:%+v\n", err)
+		logrus.Errorf("[LogisticsTalentList] call LogisticsTalentList err:%+v\n", err)
 		returnError(c, 40000, err.Error())
 		return
 	}
@@ -831,7 +871,7 @@ func (t TaskController) LocalLifeTaskList(c *gin.Context) {
 	}
 	res, err := service.LocalLifeService{}.GetLocalLifeTaskList(param)
 	if err != nil {
-		logrus.Errorf("[LocalLifeTaskList] call Show err:%+v\n", err)
+		logrus.Errorf("[LocalLifeTaskList] call GetLocalLifeTaskList err:%+v\n", err)
 		returnError(c, 40000, err.Error())
 		return
 	}
@@ -850,7 +890,27 @@ func (t TaskController) LocalLifeDel(c *gin.Context) {
 	}
 	localId, err := service.LocalLifeService{}.DeleteLocalLife(param.LocalId)
 	if err != nil {
-		logrus.Errorf("[LocalLifeDel] call Show err:%+v\n", err)
+		logrus.Errorf("[DeleteLocalLife] call DeleteLocalLife err:%+v\n", err)
+		returnError(c, 40000, err.Error())
+		return
+	}
+	resultMap := make(map[string]string)
+	resultMap["localId"] = *localId
+	returnSuccess(c, 20000, resultMap)
+}
+
+// 结束本地生活任务
+func (t TaskController) LocalLifeClose(c *gin.Context) {
+	param := &vo.LocalSearchParam{}
+	err := c.BindJSON(param)
+	if err != nil {
+		logrus.Errorf("Request bind err:%+v\n", err)
+		returnError(c, 40000, "Parameter Error: "+err.Error())
+		return
+	}
+	localId, err := service.LocalLifeService{}.CloseLocalLife(param.LocalId)
+	if err != nil {
+		logrus.Errorf("[CloseLocalLife] call CloseLocalLife err:%+v\n", err)
 		returnError(c, 40000, err.Error())
 		return
 	}
@@ -870,7 +930,7 @@ func (t TaskController) StoreExploreList(c *gin.Context) {
 	}
 	res, err := service.LocalLifeService{}.GetStoreExploreList(param)
 	if err != nil {
-		logrus.Errorf("[StoreExploreList] call Show err:%+v\n", err)
+		logrus.Errorf("[StoreExploreList] call StoreExploreList err:%+v\n", err)
 		returnError(c, 40000, err.Error())
 		return
 	}

app/service/local_life_service.go

@@ -971,6 +971,16 @@ func (s LocalLifeService) DeleteLocalLife(localId string) (*string, error) {
 	return res, nil
 }
 
+// 结束本地生活任务
+func (s LocalLifeService) CloseLocalLife(localId string) (*string, error) {
+	err := dao.LocalLifeDao{}.UpdateLocal(entity.LocalLifeInfo{
+		LocalID:    localId,
+		TaskStatus: 10,
+		UpdatedAt:  time.Now(),
+	})
+	return &localId, err
+}
+
 // 草稿箱——本地生活
 func (s LocalLifeService) GetLocalLifeDraftList(param *vo.LocalDraftParam) (vo.ResultVO, error) {
 	if param.Page == 0 {

app/service/project_service.go

@@ -935,6 +935,16 @@ func (s ProjectService) DeleteProject(projectId string) (*string, error) {
 	return res, nil
 }
 
+// 结束种草任务
+func (s ProjectService) CloseProject(projectId string) (*string, error) {
+	err := dao.ProjectDAO{}.UpdateProject(entity.Project{
+		ProjectId:     projectId,
+		ProjectStatus: 10,
+		UpdatedAt:     time.Now(),
+	})
+	return &projectId, err
+}
+
 // 草稿箱——品牌种草
 func (s ProjectService) GetProjectDraftList(param *vo.ProjectDraftParam) (vo.ResultVO, error) {
 	if param.Page == 0 {

app/service/selection_info_service.go

@@ -887,6 +887,16 @@ func (s SelectionInfoService) DeleteSelection(selectionId string) (*string, erro
 	return res, nil
 }
 
+// 结束带货任务
+func (s SelectionInfoService) CloseSelection(selectionId string) (*string, error) {
+	err := dao.SelectionInfoDAO{}.UpdateSelectionInfo(entity.SelectionInfo{
+		SelectionID:     selectionId,
+		SelectionStatus: 8,
+		UpdatedAt:       time.Now(),
+	})
+	return &selectionId, err
+}
+
 // 草稿箱——电商带货
 func (s SelectionInfoService) GetSelectionDraftList(param *vo.SelectionDraftParam) (vo.ResultVO, error) {
 	if param.Page == 0 {

route/init.go

@@ -183,6 +183,7 @@ func InitRoute(r *gin.Engine) {
 		task.POST("/selection/toReview", controller.TaskController{}.SelectionToReview)         // 电商带货提交审核
 		task.POST("/selection/task/list", controller.TaskController{}.SelectionTaskList)        // 电商带货任务列表
 		task.POST("/selection/del", controller.TaskController{}.SelectionDel)                   // 删除带货任务
+		task.POST("/selection/close", controller.TaskController{}.SelectionClose)               // 结束带货任务
 		task.POST("/selection/data/talent", controller.TaskController{}.TalentDataDetail)       // 电商带货看数据-达人数据
 		task.POST("/selection/data/sample", controller.TaskController{}.SampleDataDetail)       // 电商带货看数据-领样数据
 		task.POST("/selection/data/selection", controller.TaskController{}.SelectionDataDetail) // 电商带货看数据-带货数据
@@ -196,6 +197,7 @@ func InitRoute(r *gin.Engine) {
 		task.POST("/project/toReview", controller.TaskController{}.ProjectToReview)          // 种草提交审核
 		task.POST("/project/task/list", controller.TaskController{}.ProjectTaskList)         // 种草任务列表
 		task.POST("/project/del", controller.TaskController{}.ProjectDel)                    // 删除种草任务
+		task.POST("/project/close", controller.TaskController{}.ProjectClose)                // 结束种草任务
 		task.POST("/talent/category", controller.TaskController{}.GetTalentCategory)         // 达人内容类型
 
 		task.POST("/store/category", controller.TaskController{}.GetStoreCategory)     // 门店类目
@@ -212,6 +214,7 @@ func InitRoute(r *gin.Engine) {
 		task.POST("/localLife/toReview", controller.TaskController{}.LocalLifeToReview)          // 本地生活提交审核
 		task.POST("/localLife/task/list", controller.TaskController{}.LocalLifeTaskList)         // 本地生活列表
 		task.POST("/localLife/del", controller.TaskController{}.LocalLifeDel)                    // 删除本地生活
+		task.POST("/localLife/close", controller.TaskController{}.LocalLifeClose)                // 结束本地生活
 
 		// 招募中、执行中
 		task.POST("/project/getTasklist", handler.WrapGetTaskListHandler)            //种草招募中选达人列表/查名单