Merge branch 'feature_yl' of HolaBIP/youngee_m_api into develop

db/project.go

@@ -39,7 +39,8 @@ func GetFullProjectList(ctx context.Context, pageSize, pageNum int32, condition
 			db = db.Where(fmt.Sprintf("project_status != 7"))
 		}
 		if !util.IsBlank(value) && tag != "updated_at" && tag != "project_name" {
-			db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
+			log.Println(tag, value.Interface())
+			db = db.Debug().Where(fmt.Sprintf("%s = ?", tag), value.Interface())
 		}
 		if tag == "updated_at" && value.Interface() != "0" {
 			db = db.Where(fmt.Sprintf("updated_at like '%s%%'", value.Interface()))

model/common_model/project_condition.go

@@ -1,7 +1,7 @@
 package common_model
 
 type ProjectCondition struct {
-	ProjectId          int64 `condition:"project_id"`       // 项目ID
+	ProjectId          string `condition:"project_id"`       // 项目ID
 	ProjectName        string `condition:"project_name"`     // 项目名
 	ProjectStatus      int64  `condition:"project_status"`   // 项目状态
 	ProjectPlatform    int64  `condition:"project_platform"` // 项目平台

model/http_model/project_update.go

@@ -20,7 +20,7 @@ type UpdateProjectRequest struct {
 	ProjectForm      string                  `json:"project_form"`      // 项目形式，1-4分别代表实体商品寄拍、虚拟产品测评、线下探店打卡、素材微原创
 	ProjectType      int64                   `json:"project_type"`      // 项目类型，1代表全流程项目，2代表专项项目
 	TalentType       string                  `json:"talent_type"`       // 达人类型
-	ProjectStatus    int                     `json:"project_status"`    // 要保存的项目状态
+	ProjectStatus    int64                   `json:"project_status"`    // 要保存的项目状态
 	RecruitDdl       string                  `json:"recruit_ddl"`       // 招募截止时间
 	ContentType      string                  `json:"content_type"`      // 内容形式，1代表图文，2代表视频
 	ProjectDetail    string                  `json:"project_detail"`    // 项目详情

pack/full_project_condition.go

@@ -7,15 +7,15 @@ import (
 )
 
 func HttpFullProjectRequestToCondition(req *http_model.FullProjectListRequest) *common_model.ProjectCondition {
-	projectUpdated := conv.MustString(req.ProjectUpdated,"")
+	projectUpdated := conv.MustString(req.ProjectUpdated, "")
 	projectName := req.ProjectName
 	return &common_model.ProjectCondition{
-		ProjectId:          conv.MustInt64(req.ProjectId,0),
+		ProjectId:          req.ProjectId,
 		ProjectName:        projectName,
-		ProjectStatus:      conv.MustInt64(req.ProjectStatus,0),
-		ProjectPlatform:    conv.MustInt64(req.ProjectPlatform,0),
-		ProjectForm:        conv.MustInt64(req.ProjectForm,0),
-		ProjectContentType: conv.MustInt64(req.ProjectContentType,0),
+		ProjectStatus:      conv.MustInt64(req.ProjectStatus, 0),
+		ProjectPlatform:    conv.MustInt64(req.ProjectPlatform, 0),
+		ProjectForm:        conv.MustInt64(req.ProjectForm, 0),
+		ProjectContentType: conv.MustInt64(req.ProjectContentType, 0),
 		ProjectUpdated:     projectUpdated,
 	}
 }

service/auto_task.go

@@ -204,8 +204,8 @@ func AutoTask() error {
 	}
 	//定时任务
 	//spec := "*/30 * * * * ?" //cron表达式，每10秒一次
-	//spec := "0 */1 * * * ?" //cron表达式，每一分钟执行一次
-	spec := "0 0 * * * *" //每小时执行
+	spec := "0 */1 * * * ?" //cron表达式，每一分钟执行一次
+	//spec := "0 0 * * * *" //每小时执行
 	// 添加定时任务,
 	_, err := crontab.AddFunc("@midnight", taskKDStatus)
 	//_, err := crontab.AddFunc("*/30 * * * * ?", taskKDStatus)

service/project.go

@@ -369,7 +369,7 @@ func (*project) Update(ctx context.Context, newProject http_model.UpdateProjectR
 			ProjectDetail: newProject.ProjectDetail,
 			ProjectForm:   conv.MustInt64(newProject.ProjectForm, 0),
 			EnterpriseID:  enterpriseID,
-			ProjectStatus: int64(newProject.ProjectStatus),
+			ProjectStatus: newProject.ProjectStatus,
 			FeeForm:       feeForms,
 			EstimatedCost: ECost,
 			SubmitAt:      &t,
@@ -384,7 +384,7 @@ func (*project) Update(ctx context.Context, newProject http_model.UpdateProjectR
 			ProjectDetail: newProject.ProjectDetail,
 			ProjectForm:   conv.MustInt64(newProject.ProjectForm, 0),
 			EnterpriseID:  enterpriseID,
-			ProjectStatus: int64(newProject.ProjectStatus),
+			ProjectStatus: newProject.ProjectStatus,
 			FeeForm:       feeForms,
 			EstimatedCost: ECost,
 			SubmitAt:      &t,