Merge commit 'FETCH_HEAD' into develop

db/operate.go

@@ -22,11 +22,11 @@ func CreatePricingStrategy(ctx context.Context, req *http_model.AddPricingReques
 	if err == nil {
 		return "该策略与已经运行的策略互斥，请修改相关字段后重新创建", "", nil
 	}
-	err = db.Where(" fee_form = ? && platform = ? && fans_low <= ? && fans_up >= ?", fee_form, platform, fans_low, fans_low).First(&IsExclusive1).Error
+	err = db.Where(" fee_form = ? && platform = ? && fans_low < ? && fans_up > ?", fee_form, platform, fans_low, fans_low).First(&IsExclusive1).Error
 	if err == nil {
 		return "该策略与已经运行的策略互斥，请修改相关字段后重新创建", "", nil
 	}
-	err = db.Where(" fee_form = ? && platform = ? && fans_low <= ? && fans_up >= ?", fee_form, platform, fans_up, fans_up).First(&IsExclusive2).Error
+	err = db.Where(" fee_form = ? && platform = ? && fans_low < ? && fans_up > ?", fee_form, platform, fans_up, fans_up).First(&IsExclusive2).Error
 	if err == nil {
 		return "该策略与已经运行的策略互斥，请修改相关字段后重新创建", "", nil
 	}
@@ -124,11 +124,11 @@ func ModifyPricing(ctx context.Context, req *http_model.ModifyPricingRequest) (s
 	if err == nil {
 		return "该策略与已经运行的策略互斥，请修改相关字段后重新创建", nil
 	}
-	err = db.Where(" fee_form = ? && platform = ? && fans_low <= ? && fans_up >= ?", fee_form, platform, fans_low, fans_low).First(&IsExclusive1).Error
+	err = db.Where(" fee_form = ? && platform = ? && fans_low < ? && fans_up > ?", fee_form, platform, fans_low, fans_low).First(&IsExclusive1).Error
 	if err == nil {
 		return "该策略与已经运行的策略互斥，请修改相关字段后重新创建", nil
 	}
-	err = db.Where(" fee_form = ? && platform = ? && fans_low <= ? && fans_up >= ?", fee_form, platform, fans_up, fans_up).First(&IsExclusive2).Error
+	err = db.Where(" fee_form = ? && platform = ? && fans_low < ? && fans_up > ?", fee_form, platform, fans_up, fans_up).First(&IsExclusive2).Error
 	if err == nil {
 		return "该策略与已经运行的策略互斥，请修改相关字段后重新创建", nil
 	}

service/project.go

@@ -113,84 +113,6 @@ func (*project) GetProjectDetail(ctx context.Context, projectID int64) (*http_mo
 	return &ProjectDetail, nil
 }
 
-//func (*project) Update(ctx context.Context, newProject http_model.UpdateProjectRequest, enterpriseID string) (*http_model.UpdateProjectData, error) {
-//	dbStart := db.GetReadDB(ctx)
-//	var autoTaskInfo gorm_model.InfoAutoTask
-//	err1 := dbStart.Model(gorm_model.InfoAutoTask{}).Last(&autoTaskInfo).Error
-//	if err1 != nil {
-//		return nil, err1
-//	}
-//	//fmt.Println("newproject：", newProject)
-//	project := gorm_model.ProjectInfo{
-//		ProjectID:     conv.MustInt64(newProject.ProjectID, 0),
-//		RecruitDdl:    newProject.RecruitDdl,
-//		TalentType:    newProject.TalentType,
-//		ContentType:   conv.MustInt64(newProject.ContentType, 0),
-//		ProjectDetail: newProject.ProjectDetail,
-//		ProjectForm:   conv.MustInt64(newProject.ProjectForm, 0),
-//		EnterpriseID:  conv.MustInt64(enterpriseID, 0),
-//		ProjectStatus: 4,
-//		AutoTaskID:    int(autoTaskInfo.AutoTaskID),
-//	}
-//	projectID, err := db.UpdateProject(ctx, project)
-//	if err != nil {
-//		return nil, err
-//	}
-//	// 删除该项目之前的所有图片
-//	err = db.DeleteProjectPhotoByProjecttID(ctx, *projectID)
-//	if err != nil {
-//		return nil, err
-//	}
-//	fmt.Printf("照片:\t %+v", newProject.ProjectPhotos)
-//	if newProject.ProjectPhotos != nil {
-//		// 新增图片
-//		projectPhotos := []gorm_model.ProjectPhoto{}
-//		for _, photo := range newProject.ProjectPhotos {
-//			projectPhoto := gorm_model.ProjectPhoto{
-//				ProjectID: project.ProjectID,
-//				PhotoUrl:  photo.PhotoUrl,
-//				PhotoUid:  photo.PhotoUid,
-//			}
-//			projectPhotos = append(projectPhotos, projectPhoto)
-//		}
-//		err = db.CreateProjectPhoto(ctx, projectPhotos)
-//		if err != nil {
-//			return nil, err
-//		}
-//	}
-//	// 删除该项目之前的所有策略
-//	err = db.DeleteRecruitStrategyByProjectID(ctx, *projectID)
-//	if err != nil {
-//		return nil, err
-//	}
-//	fmt.Printf("策略:\t %+v", newProject.RecruitStrategys)
-//	if newProject.RecruitStrategys != nil {
-//		// 新增策略
-//		RecruitStrategys := []gorm_model.RecruitStrategy{}
-//		for _, Strategy := range newProject.RecruitStrategys {
-//			RecruitStrategy := gorm_model.RecruitStrategy{
-//				FeeForm:       conv.MustInt64(Strategy.FeeForm, 0),
-//				StrategyID:    conv.MustInt64(Strategy.StrategyID, 0),
-//				FollowersLow:  conv.MustInt64(Strategy.FollowersLow, 0),
-//				FollowersUp:   conv.MustInt64(Strategy.FollowersUp, 0),
-//				RecruitNumber: conv.MustInt64(Strategy.RecruitNumber, 0),
-//				Offer:         conv.MustInt64(Strategy.Offer, 0),
-//				ProjectID:     project.ProjectID,
-//			}
-//			fmt.Printf("Offer:\t %+v", Strategy.Offer)
-//			RecruitStrategys = append(RecruitStrategys, RecruitStrategy)
-//		}
-//		err = db.CreateRecruitStrategy(ctx, RecruitStrategys)
-//		if err != nil {
-//			return nil, err
-//		}
-//	}
-//	res := &http_model.UpdateProjectData{
-//		ProjectID: *projectID,
-//	}
-//	return res, nil
-//}
-
 func (*project) ApproveProject(ctx *gin.Context, data http_model.ApproveProjectRequest) (error, string) {
 	//fmt.Println("data.IsApprove：", data.IsApprove)
 	err, message := db.ApproveProject(ctx, data.ProjectId, data.IsApprove)
@@ -225,85 +147,6 @@ func (*project) GetProjectTaskList(ctx context.Context, projectID string, pageSi
 	return projectTaskListData, nil
 }
 
-//func (*project) Create(ctx context.Context, newProject http_model.CreateProjectRequest, enterpriseID int64) (*http_model.CreateProjectData, error) {
-//	// build gorm_model.ProjectInfo
-//	// 查询关联商品信息
-//	product, err := db.GetProductByID(ctx, newProject.ProductID)
-//	if err != nil {
-//		return nil, err
-//	}
-//	// 按照品牌名-商品名对项目进行命名
-//	projectName := product.BrandName + "-" + product.ProductName
-//	//feeForm := fmt.Sprintf("[")
-//	feeFrom := []string{}
-//	for _, strategy := range newProject.RecruitStrategys {
-//		//if strategy.StrategyID
-//		feeFrom = append(feeFrom, strconv.FormatInt(strategy.FeeForm, 10))
-//		//feeForm += string(strategy.StrategyID)
-//	}
-//	feeFroms := strings.Join(feeFrom, ",")
-//
-//	projectInfo := gorm_model.ProjectInfo{
-//		ProjectName:     projectName,
-//		ProjectStatus:   1,
-//		ProjectType:     newProject.ProjectType,
-//		TalentType:      newProject.TalentType,
-//		ProjectPlatform: newProject.ProjectPlatform,
-//		ProjectForm:     newProject.ProjectForm,
-//		RecruitDdl:      newProject.RecruitDdl,
-//		ProjectDetail:   newProject.ProjectDetail,
-//		ContentType:     newProject.ContentType,
-//		EnterpriseID:    enterpriseID,
-//		ProductID:       newProject.ProductID,
-//		FeeForm:         feeFroms,
-//	}
-//	// db create ProjectInfo
-//	projectID, err := db.CreateProject(ctx, projectInfo)
-//	if err != nil {
-//		return nil, err
-//	}
-//	if newProject.ProjectPhotos != nil {
-//		// build []gorm_model.ProjectPhoto
-//		projectPhotos := []gorm_model.ProjectPhoto{}
-//		for _, photo := range newProject.ProjectPhotos {
-//			projectPhoto := gorm_model.ProjectPhoto{
-//				PhotoUrl:  photo.PhotoUrl,
-//				PhotoUid:  photo.PhotoUid,
-//				ProjectID: *projectID,
-//			}
-//			projectPhotos = append(projectPhotos, projectPhoto)
-//		}
-//		// db create ProjectPhoto
-//		err = db.CreateProjectPhoto(ctx, projectPhotos)
-//		if err != nil {
-//			return nil, err
-//		}
-//	}
-//	// build
-//	recruitStrategys := []gorm_model.RecruitStrategy{}
-//	for _, strategy := range newProject.RecruitStrategys {
-//		recruitStrategy := gorm_model.RecruitStrategy{
-//			FeeForm:       strategy.FeeForm,
-//			StrategyID:    strategy.StrategyID,
-//			FollowersLow:  strategy.FollowersLow,
-//			FollowersUp:   strategy.FollowersUp,
-//			RecruitNumber: strategy.RecruitNumber,
-//			Offer:         strategy.Offer,
-//			ProjectID:     *projectID,
-//		}
-//		recruitStrategys = append(recruitStrategys, recruitStrategy)
-//	}
-//	err = db.CreateRecruitStrategy(ctx, recruitStrategys)
-//	if err != nil {
-//		return nil, err
-//	}
-//	res := &http_model.CreateProjectData{
-//		ProjectID: *projectID,
-//	}
-//	fmt.Printf("%+v", res)
-//	return res, nil
-//}
-
 func (*project) Create(ctx context.Context, newProject http_model.CreateProjectRequest, enterpriseID int64) (*http_model.CreateProjectData, error) {
 	// build gorm_model.ProjectInfo
 	// 查询关联商品信息
@@ -341,7 +184,8 @@ func (*project) Create(ctx context.Context, newProject http_model.CreateProjectR
 	if err != nil {
 		return nil, err
 	}
-	if newProject.ProjectPhotos != nil {
+	fmt.Println("ProjectPhotos:", newProject.ProjectPhotos)
+	if len(newProject.ProjectPhotos) != 0 {
 		// build []gorm_model.ProjectPhoto
 		projectPhotos := []gorm_model.ProjectPhoto{}
 		for _, photo := range newProject.ProjectPhotos {
@@ -383,6 +227,7 @@ func (*project) Create(ctx context.Context, newProject http_model.CreateProjectR
 	fmt.Printf("%+v", res)
 	return res, nil
 }
+
 func (*project) Update(ctx context.Context, newProject http_model.UpdateProjectRequest, enterpriseID int64) (*http_model.UpdateProjectData, error) {
 	//fmt.Println("newproject：", newProject)
 	project := gorm_model.ProjectInfo{
@@ -455,30 +300,6 @@ func (*project) Update(ctx context.Context, newProject http_model.UpdateProjectR
 	return res, nil
 }
 
-//func (*project) GetFullProjectList(ctx context.Context, enterpriseID int64, pageSize, pageNum int32, condition *common_model.ProjectCondition) (*http_model.FullProjectListData, error) {
-//	fullProjects, total, err := db.GetFullProjectList(ctx, enterpriseID, pageSize, pageNum, condition)
-//	if err != nil {
-//		logrus.WithContext(ctx).Errorf("[project service] call GetFullProjectList error,err:%+v", err)
-//		return nil, err
-//	}
-//	fullProjectListData := new(http_model.FullProjectListData)
-//	fullProjectListData.FullProjectPreview = pack.MGormFullProjectToHttpFullProjectPreview(fullProjects)
-//	fullProjectListData.Total = conv.MustString(total)
-//	return fullProjectListData, nil
-//}
-//
-//func (*project) GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum int64, conditions *common_model.TaskConditions) (*http_model.ProjectTaskListData, error) {
-//	projectTasks, total, err := db.GetProjectTaskList(ctx, projectID, pageSize, pageNum, conditions)
-//	if err != nil {
-//		logrus.WithContext(ctx).Errorf("[project service] call GetProjectTaskList error,err:%+v", err)
-//		return nil, err
-//	}
-//	projectTaskListData := new(http_model.ProjectTaskListData)
-//	projectTaskListData.ProjectTaskPreview = pack.MGormProjectTaskToHttpProjectTaskPreview(projectTasks)
-//	projectTaskListData.Total = conv.MustString(total)
-//	return projectTaskListData, nil
-//}
-
 func (*project) GetPorjectDetail(ctx context.Context, projectID int64) (*http_model.ShowProjectData, error) {
 	project, err := db.GetProjectDetail(ctx, projectID)
 	if err != nil {