Merge branch 'refs/heads/develop' into develop-zhou

db/auto_task.go

@@ -146,7 +146,7 @@ func AutoCompleteSelection() error {
 	return nil
 }
 
-// GetAutoDraftDefaultTask 品牌种草-商品寄拍 初稿超时违约
+// GetAutoDraftDefaultTask 初稿违约一
 func GetAutoDraftDefaultTask() error {
 	fmt.Println("GetAutoDraftDefaultInPicTask Running")
 	db := GetReadDB(context.Background())
@@ -395,7 +395,7 @@ func GetAutoDraftDefaultTask() error {
 	return nil
 }
 
-// GetAutoLinkDefaultTask 品牌种草 链接超时违约
+// GetAutoLinkDefaultTask 链接质检违约
 func GetAutoLinkDefaultTask() error {
 
 	// 1. 筛选出可能链接超时违约的子任务，首次/修改
@@ -635,7 +635,7 @@ func GetAutoLinkDefaultTask() error {
 	return nil
 }
 
-// GetAutoCaseCloseDefaultTask 品牌种草 数据超时违约
+// GetAutoCaseCloseDefaultTask 数据质检违约
 func GetAutoCaseCloseDefaultTask() error {
 
 	// 1. 筛选出可能数据违约的种草子任务 待上传/待修改

db/locallife_task.go

@@ -27,7 +27,7 @@ func GetLocalRecruittime(ctx context.Context, request http_model.GetLocalRecruit
 }
 
 func GetLocalTalentstatusCount(db *gorm.DB, request http_model.GetLocalTalentstatusNumRequest, status int) (int64, error) {
-	query := db.Model(&gorm_model.YoungeeLocalTaskInfo{}).Where("project_id = ? AND task_status = ?", request.ProjectId, status)
+	query := db.Model(&gorm_model.YoungeeLocalTaskInfo{}).Where("local_id = ? AND task_status = ?", request.ProjectId, status)
 
 	// 计算总数
 	var total int64
@@ -52,7 +52,7 @@ func GetLocalTalentstatusNumCount(ctx context.Context, request http_model.GetLoc
 }
 
 func GetLocalTalentstatusNum(db *gorm.DB, request http_model.GetLocalTalentstatusCountRequest, status int) (int64, error) {
-	query := db.Model(&gorm_model.YoungeeLocalTaskInfo{}).Where("project_id = ? AND task_stage = ?", request.ProjectId, status)
+	query := db.Model(&gorm_model.YoungeeLocalTaskInfo{}).Where("local_id = ? AND task_stage = ?", request.ProjectId, status)
 	var total int64
 	if err := query.Count(&total).Error; err != nil {
 		return 0, err
@@ -144,9 +144,9 @@ func GetLocallifetaskList(ctx context.Context, request http_model.GetLocalTaskLi
 				}
 			case "collectnum":
 				if order == "asc" {
-					query = query.Order("view_num asc")
+					query = query.Order("collect_num asc")
 				} else {
-					query = query.Order("view_num desc")
+					query = query.Order("collect_num desc")
 				}
 			}
 		}
@@ -344,6 +344,20 @@ func PassLocalTaskCoop(ctx context.Context, req http_model.PasslocalTaskCoopRequ
 		}
 	}
 
+	var opid string
+	var optype int
+	switch req.OperateType {
+	case 3:
+		{
+			opid = req.EnterpriseId
+			optype = 1
+		}
+	case 4:
+		{
+			opid = req.OperatorId
+			optype = 2
+		}
+	}
 	//4.根据达人来源改变状态、阶段、数目
 	var tasks []gorm_model.YoungeeLocalTaskInfo
 	err = db.Model(gorm_model.YoungeeLocalTaskInfo{}).Where("task_id IN ? AND task_stage = 1", req.TaskIds).Find(&tasks).Error
@@ -358,8 +372,8 @@ func PassLocalTaskCoop(ctx context.Context, req http_model.PasslocalTaskCoopRequ
 					TaskStage:     taskstages,
 					TaskStatus:    2,
 					UpdateAt:      time.Now(),
-					BOperator:     req.OperatorId,
-					BOperatorType: req.OperateType,
+					BOperator:     opid,
+					BOperatorType: optype,
 					SelectDate:    time.Now(),
 				}
 				err = tx.Model(gorm_model.YoungeeLocalTaskInfo{}).Where("task_id = ? AND task_stage = 1", taskInfo.TaskId).Updates(updateData).Error
@@ -374,7 +388,7 @@ func PassLocalTaskCoop(ctx context.Context, req http_model.PasslocalTaskCoopRequ
 					return err
 				}
 				projectinfo.RecruitNum += 1
-				projectinfo.EstimatedCost += taskInfo.SupportFee
+				projectinfo.NeedPay += taskInfo.SupportFee
 				err = tx.Model(gorm_model.YounggeeLocalLifeInfo{}).Where("local_id = ? ", req.ProjectId).Updates(projectinfo).Error
 				if err != nil {
 					return err
@@ -415,8 +429,8 @@ func PassLocalTaskCoop(ctx context.Context, req http_model.PasslocalTaskCoopRequ
 					TaskStage:     taskstages,
 					TaskStatus:    2,
 					UpdateAt:      time.Now(),
-					BOperator:     req.OperatorId,
-					BOperatorType: req.OperateType,
+					BOperator:     opid,
+					BOperatorType: optype,
 					SelectDate:    time.Now(),
 				}
 				err = tx.Model(gorm_model.YoungeeLocalTaskInfo{}).Where("task_id = ? AND task_stage = 1", taskInfo.TaskId).Updates(updateData).Error
@@ -431,6 +445,7 @@ func PassLocalTaskCoop(ctx context.Context, req http_model.PasslocalTaskCoopRequ
 					return err
 				}
 				projectinfo.RecruitNum += 1
+				projectinfo.NeedPay += taskInfo.SupportFee
 				err = tx.Model(gorm_model.YounggeeLocalLifeInfo{}).Where("local_id = ? ", req.ProjectId).Updates(projectinfo).Error
 				if err != nil {
 					return err
@@ -466,6 +481,21 @@ func RefuseLocalTaskCoop(ctx context.Context, req http_model.RefuselocalTaskCoop
 		return false, errors.New("任务id有误")
 	}
 
+	var opid string
+	var optype int
+	switch req.OperateType {
+	case 3:
+		{
+			opid = req.EnterpriseId
+			optype = 1
+		}
+	case 4:
+		{
+			opid = req.OperatorId
+			optype = 2
+		}
+	}
+
 	// 2. 查询任务对应达人id（用于生成达人消息）
 	var talentIds []string
 	err = db.Model(gorm_model.YoungeeLocalTaskInfo{}).Where("task_id IN ?", req.TaskIds).Select("talent_id").Find(&talentIds).Error
@@ -483,8 +513,8 @@ func RefuseLocalTaskCoop(ctx context.Context, req http_model.RefuselocalTaskCoop
 				TaskStage:     3,
 				TaskStatus:    3,
 				UpdateAt:      time.Now(),
-				BOperator:     req.OperatorId,
-				BOperatorType: req.OperateType,
+				BOperator:     opid,
+				BOperatorType: optype,
 				CompleteDate:  time.Now(),
 			}
 			err = tx.Model(gorm_model.YoungeeLocalTaskInfo{}).Where("task_id = ? AND task_stage = 1", taskInfo.TaskId).Updates(updateData).Error
@@ -838,11 +868,12 @@ func GetLocalSketchList(ctx context.Context, request http_model.LocalTasksketchl
 		}
 		boperator := getBOperator(db, task.BOperator, task.BOperatorType)
 		response := &http_model.LocalTasksketchinfo{
-			Task:     taskinfo,
-			SketchId: sketchinfo.SketchID,
-			SubmitAt: sketchinfo.SubmitAt.Format("2006-01-02 15:04:05"),
-			AgreeAt:  sketchinfo.AgreeAt.Format("2006-01-02 15:04:05"),
-			Operator: boperator,
+			Task:       taskinfo,
+			SketchId:   sketchinfo.SketchID,
+			SubmitAt:   sketchinfo.SubmitAt.Format("2006-01-02 15:04:05"),
+			AgreeAt:    sketchinfo.AgreeAt.Format("2006-01-02 15:04:05"),
+			SketchType: sketchinfo.Type,
+			Operator:   boperator,
 		}
 		taskInfoPointers = append(taskInfoPointers, response)
 

db/project_task.go

@@ -140,9 +140,9 @@ func GetProjecttaskList(ctx context.Context, request http_model.GetTaskListReque
 				}
 			case "collectnum":
 				if order == "asc" {
-					query = query.Order("view_num asc")
+					query = query.Order("collect_num asc")
 				} else {
-					query = query.Order("view_num desc")
+					query = query.Order("collect_num desc")
 				}
 			}
 		}
@@ -454,7 +454,7 @@ func PassProTaskCoop(ctx context.Context, projectId string, taskIds []string, op
 					return err
 				}
 				projectinfo.RecruitNum += 1
-				projectinfo.EstimatedCost += taskInfo.SupportFee
+				projectinfo.NeedPay += taskInfo.SupportFee
 				err = tx.Model(gorm_model.ProjectInfo{}).Where("project_id = ? ", projectId).Updates(projectinfo).Error
 				if err != nil {
 					return err
@@ -504,13 +504,14 @@ func PassProTaskCoop(ctx context.Context, projectId string, taskIds []string, op
 					return err
 				}
 
-				//project招募数+1
+				//project招募数+1,成本
 				var projectinfo gorm_model.ProjectInfo
 				err = db.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).Find(&projectinfo).Error
 				if err != nil {
 					return err
 				}
 				projectinfo.RecruitNum += 1
+				projectinfo.NeedPay += taskInfo.SupportFee
 				err = tx.Model(gorm_model.ProjectInfo{}).Where("project_id = ? ", projectId).Updates(projectinfo).Error
 				if err != nil {
 					return err
@@ -816,11 +817,12 @@ func GetSketchList(ctx context.Context, request http_model.TasksketchlistRequest
 
 		boperator := getBOperator(db, task.BOperator, task.BOperatorType)
 		response := &http_model.Tasksketchinfo{
-			Task:     taskinfo,
-			SketchId: sketchinfo.SketchID,
-			SubmitAt: sketchinfo.SubmitAt.Format("2006-01-02 15:04:05"),
-			AgreeAt:  sketchinfo.AgreeAt.Format("2006-01-02 15:04:05"),
-			Operator: boperator,
+			Task:       taskinfo,
+			SketchId:   sketchinfo.SketchID,
+			SubmitAt:   sketchinfo.SubmitAt.Format("2006-01-02 15:04:05"),
+			AgreeAt:    sketchinfo.AgreeAt.Format("2006-01-02 15:04:05"),
+			SketchType: sketchinfo.Type,
+			Operator:   boperator,
 		}
 		taskInfoPointers = append(taskInfoPointers, response)
 

db/sectask.go

@@ -104,7 +104,7 @@ func GetSecTaskList(ctx context.Context, selectionId string, taskStatus int, sea
 		}
 	} else {
 		// 默认排序
-		db = db.Order("sec_task_id desc")
+		db = db.Order("task_id desc")
 	}
 
 	// 查询总数

model/gorm_model/locallife_info.go

@@ -47,6 +47,7 @@ type YounggeeLocalLifeInfo struct {
 	NeedQuality         int        `gorm:"column:need_quality;type:int(11);default:0;comment:待质检;NOT NULL" json:"need_quality"`
 	NeedCalculate       int        `gorm:"column:need_calculate;type:int(11);default:0;comment:待结算;NOT NULL" json:"need_calculate"`
 	InvoiceStatus       int        `gorm:"column:invoice_status;type:int(11);default:0;comment:开票状态（1开票中 2已开票）;NOT NULL" json:"invoice_status"`
+	NeedPay             float64    `gorm:"column:need_pay"`
 }
 
 func (m *YounggeeLocalLifeInfo) TableName() string {

model/gorm_model/locallife_task_info.go

@@ -56,6 +56,7 @@ type YoungeeLocalTaskInfo struct {
 	FansNum                int       `gorm:"column:fans_num;type:int(11);comment:粉丝数" json:"fans_num"`
 	VoteAvg                int       `gorm:"column:vote_avg;type:int(11);comment:平均点赞数" json:"vote_avg"`
 	CommitAvg              int       `gorm:"column:commit_avg;type:int(11);comment:平均评论数" json:"commit_avg"`
+	CollectNum             int       `gorm:"collect_num;type:int(11);comment:平均收藏数" json:"collect_num"`
 	BOperator              string    `gorm:"column:b_operator;type:varchar(255);comment:商家确定达人操作人ID" json:"b_operator"`
 	BOperatorType          int       `gorm:"column:b_operator_type;type:int(11);default:0;comment:商家操作人类型，1商家用户，2商家子账号，3管理后台" json:"b_operator_type"`
 	SOperator              int       `gorm:"column:s_operator;type:int(11);default:0;comment:服务商提报达人操作人ID" json:"s_operator"`

model/gorm_model/project.go

@@ -48,6 +48,7 @@ type ProjectInfo struct {
 	ViewNum           int64      `gorm:"column:view_num"`                 // 浏览量
 	Tools             string     `gorm:"column:tools"`                    // 工具选择，1邀约招募 2结算账单 3样品物流 4审稿工具 5作品审查 6数据巡检（,分隔）
 	InvoiceStatus     int64      `gorm:"column:invoice_status"`           // 开票状态（1开票中 2已开票）
+	NeedPay           float64    `gorm:"column:need_pay"`
 }
 
 func (m *ProjectInfo) TableName() string {

model/gorm_model/project_task.go

@@ -49,13 +49,14 @@ type YoungeeTaskInfo struct {
 	FansNum                int       `gorm:"column:fans_num"`                             // 粉丝数
 	VoteAvg                int       `gorm:"column:vote_avg"`                             // 平均点赞数
 	CommitAvg              int       `gorm:"column:commit_avg"`                           // 平均评论数
-	BOperator              string    `gorm:"column:b_operator"`                           // 商家确定达人操作人ID
-	BOperatorType          int       `gorm:"column:b_operator_type"`                      // 商家操作人类型，1商家用户，2商家子账号，3管理后台
-	SOperator              int       `gorm:"column:s_operator"`                           // 服务商提报达人操作人ID
-	SOperatorType          int       `gorm:"column:s_operator_type"`                      // 服务商操作人类型，1服务商主账号，2服务商子账号，3管理后台
-	OpenId                 string    `gorm:"column:open_id"`                              // 达人报名的快手唯一标识
-	SupportFee             float64   `gorm:"column:support_fee"`                          //提报价格
-	SprojectId             int       `gorm:"column:s_project_id"`                         //服务商种草任务ID
+	CollectNum             int       `gorm:"column:collect_num"`
+	BOperator              string    `gorm:"column:b_operator"`      // 商家确定达人操作人ID
+	BOperatorType          int       `gorm:"column:b_operator_type"` // 商家操作人类型，1商家用户，2商家子账号，3管理后台
+	SOperator              int       `gorm:"column:s_operator"`      // 服务商提报达人操作人ID
+	SOperatorType          int       `gorm:"column:s_operator_type"` // 服务商操作人类型，1服务商主账号，2服务商子账号，3管理后台
+	OpenId                 string    `gorm:"column:open_id"`         // 达人报名的快手唯一标识
+	SupportFee             float64   `gorm:"column:support_fee"`     //提报价格
+	SprojectId             int       `gorm:"column:s_project_id"`    //服务商种草任务ID
 	CurBreakAt             time.Time `gorm:"column:cur_break_at;type:datetime;comment:当前阶段截止时间" json:"cur_break_at"`
 	SketchMissingTime      time.Time `gorm:"column:sketch_missing_time;type:datetime;comment:未传初稿违约时间" json:"sketch_missing_time"`
 	SketchMissingStatus    int       `gorm:"column:sketch_missing_status;type:int(11);default:0;comment:未传初稿违约状态，0无违约，1有违约" json:"sketch_missing_status"`

model/http_model/PassLocalTaskCoopRequest.go

@@ -1,12 +1,12 @@
 package http_model
 
 type PasslocalTaskCoopRequest struct {
-	ProjectId   string   `json:"project_id"`
-	TaskIds     []string `json:"task_ids"`
-	SProjectId  *int     `json:"s_project_id"`
-	OperatorId  string   `json:"operator_id"`
-	OperateType int      `json:"operate_type"`
-	IsSpecial   int      `json:"is_special"`
+	ProjectId    string   `json:"project_id"`
+	TaskIds      []string `json:"task_ids"`
+	OperatorId   string   `json:"operator_id"`
+	EnterpriseId string   `json:"enterprise_id"`
+	OperateType  int      `json:"operate_type"`
+	IsSpecial    int      `json:"is_special"`
 }
 
 type PasslocalTaskCoopData struct {

model/http_model/localtasksketchlist.go

@@ -16,11 +16,12 @@ type GetsketchlocaltaskListData struct {
 }
 
 type LocalTasksketchinfo struct {
-	Task     *LocaLTaskInfo `json:"task_info"`
-	SubmitAt string         `json:"submit_at"` // 提交时间
-	AgreeAt  string         `json:"agree_at"`
-	Operator string         `json:"operator"`
-	SketchId int            `json:"sketch_id"` //初稿ID
+	Task       *LocaLTaskInfo `json:"task_info"`
+	SubmitAt   string         `json:"submit_at"` // 提交时间
+	AgreeAt    string         `json:"agree_at"`
+	Operator   string         `json:"operator"`
+	SketchId   int            `json:"sketch_id"` //初稿ID
+	SketchType int            `json:"sketch_type"`
 }
 
 func NewLocalTasksketchlistRequest() *LocalTasksketchlistRequest {

model/http_model/refuselocaltaskcooprequest.go

@@ -1,9 +1,10 @@
 package http_model
 
 type RefuselocalTaskCoopRequest struct {
-	TaskIds     []string `json:"task_ids"`
-	OperatorId  string   `json:"operator_id"`
-	OperateType int      `json:"operate_type"`
+	TaskIds      []string `json:"task_ids"`
+	OperatorId   string   `json:"operator_id"`
+	OperateType  int      `json:"operate_type"`
+	EnterpriseId string   `json:"enterprise_id"`
 }
 
 type RefuselocalTaskCoopData struct {

model/http_model/tasksketchlist.go

@@ -16,11 +16,12 @@ type GetsketchtaskListData struct {
 }
 
 type Tasksketchinfo struct {
-	Task     *TaskInfo `json:"task_info"`
-	SubmitAt string    `json:"submit_at"` // 提交时间
-	AgreeAt  string    `json:"agree_at"`
-	Operator string    `json:"operator"`
-	SketchId int       `json:"sketch_id"` //初稿ID
+	Task       *TaskInfo `json:"task_info"`
+	SubmitAt   string    `json:"submit_at"` // 提交时间
+	AgreeAt    string    `json:"agree_at"`
+	Operator   string    `json:"operator"`
+	SketchId   int       `json:"sketch_id"` //初稿ID
+	SketchType int       `json:"sketch_type"`
 }
 
 func NewTasksketchlistRequest() *TasksketchlistRequest {

service/login_auth.go

@@ -164,12 +164,12 @@ func (l *loginAuth) AuthCode(ctx context.Context, phone string, code string) (st
 			Token:                token,
 			Role:                 userData.Role,
 			SubAccountId:         0,
-			JobName:              "-1",
+			JobName:              "主账号无岗位",
 			EnterpriseId:         enterpriseUser.EnterpriseID,
-			WorkshopPermission:   "-1",
-			CooperatePermission:  "-1",
-			FinancialPermission:  "-1",
-			TaskcenterPermission: "-1",
+			WorkshopPermission:   "1",
+			CooperatePermission:  "1",
+			FinancialPermission:  "1",
+			TaskcenterPermission: "1",
 		}
 	} else if ifSubAccount == 1 {
 		loginUserData = http_model.CodeLoginData{