2
0

2 Ревизии d4af34a70a ... d947f5a974

Автор SHA1 Съобщение Дата
  lin-jim-leon d947f5a974 Merge remote-tracking branch 'origin/develop' into develop преди 4 дни
  lin-jim-leon 9042eb96fb [20250729]达人platform преди 4 дни

+ 4 - 1
db/locallife_task.go

@@ -470,7 +470,10 @@ func PassLocalTaskCoop(ctx context.Context, req http_model.PasslocalTaskCoopRequ
 				}
 
 				//recruit_strategy total_offer
-				err = db.Model(gorm_model.RecruitStrategy{}).Where("strategy_id = ? AND project_id = ?", taskInfo.StrategyId, taskInfo.LocalId).Update("total_offer", gorm.Expr("total_offer + ?", taskInfo.DraftFee+taskInfo.ServiceCharge)).Error
+				err = db.Model(gorm_model.RecruitStrategy{}).Where("strategy_id = ? AND project_id = ?", taskInfo.StrategyId, taskInfo.LocalId).Updates(map[string]interface{}{
+					"total_offer":     gorm.Expr("total_offer + ?", taskInfo.DraftFee+taskInfo.ServiceCharge),
+					"selected_number": gorm.Expr("selected_number + ?", 1),
+				}).Error
 				if err != nil {
 					return err
 				}

+ 3 - 3
db/talent.go

@@ -16,7 +16,7 @@ func GetGoodstalentList(ctx context.Context, request http_model.GetGoodsTalentRe
 	query := db.Model(&gorm_model.EnterpriseTalentCooperate{}).Where("enterprise_id = ? AND cooperate_type = ?", request.EnterpriseId, 1)
 
 	// 根据平台筛选
-	if request.Platform != nil {
+	if request.Platform != -1 {
 		query.Where("platform = ?", request.Platform)
 	}
 
@@ -146,7 +146,7 @@ func GetProjecttalentList(ctx context.Context, request http_model.GetProjectTale
 	query := db.Model(&gorm_model.EnterpriseTalentCooperate{}).Where("enterprise_id = ? AND cooperate_type = ?", request.EnterpriseId, 2)
 
 	// 根据平台筛选
-	if request.Platform != nil {
+	if request.Platform != -1 {
 		query.Where("platform = ?", request.Platform)
 	}
 
@@ -262,7 +262,7 @@ func GetLocallifetalentList(ctx context.Context, request http_model.GetLocallife
 	query := db.Model(&gorm_model.EnterpriseTalentCooperate{}).Where("enterprise_id = ? AND cooperate_type = ?", request.EnterpriseId, 3)
 
 	// 根据平台筛选
-	if request.Platform != nil {
+	if request.Platform != -1 {
 		query.Where("platform = ?", &request.Platform)
 	}
 

+ 2 - 2
db/task.go

@@ -326,7 +326,7 @@ func SetProjectSettleFlag(ctx context.Context, projectid string) error {
 	}
 	settleflag := 1
 	for _, task := range tasks {
-		if task.TaskStage != 15 && task.TaskStage != 16 {
+		if task.TaskStage != 15 && task.TaskStage != 16 && task.TaskStage != 1 && task.TaskStage != 3 {
 			settleflag = 0
 		}
 	}
@@ -457,7 +457,7 @@ func SetLocalLifeSettleFlag(ctx context.Context, localid string) error {
 	}
 	settleflag := 1
 	for _, taskInfo := range tasks {
-		if taskInfo.TaskStage != 15 && taskInfo.TaskStage != 16 {
+		if taskInfo.TaskStage != 15 && taskInfo.TaskStage != 16 && taskInfo.TaskStage != 1 && taskInfo.TaskStage != 3 {
 			settleflag = 0
 		}
 	}

+ 1 - 1
model/http_model/getgoodstalentrequest.go

@@ -6,7 +6,7 @@ type GetGoodsTalentRequest struct {
 	SortField       []string `json:"sort_field,omitempty"`
 	SortOrder       []string `json:"sort_order,omitempty"` //粉丝数,实际带货销量,近30天销量,累计合作次数
 	SalesRange      *string  `json:"sales_range,omitempty"`
-	Platform        *int     `json:"platform,omitempty"`
+	Platform        int      `json:"platform"`
 	Productcategory *string  `json:"productcategory,omitempty"`
 	TalentName      string   `json:"talent_name,omitempty"`
 	EnterpriseId    string   `json:"enterprise_id"`

+ 1 - 1
model/http_model/getlocallifetalentrequest.go

@@ -5,7 +5,7 @@ type GetLocallifeTalentRequest struct {
 	PageNum      int      `json:"page_num"`
 	SortField    []string `json:"sort_field,omitempty"`
 	SortOrder    []string `json:"sort_order,omitempty"` //粉丝数,实际带货销量,近30天销量,累计合作次数
-	Platform     *int     `json:"platform,omitempty"`
+	Platform     int      `json:"platform"`
 	TalentName   string   `json:"talent_name"`
 	EnterpriseId string   `json:"enterprise_id"`
 	Area         string   `json:"area"`

+ 1 - 1
model/http_model/getprojecttalentrequest.go

@@ -5,7 +5,7 @@ type GetProjectTalentRequest struct {
 	PageNum      int      `json:"page_num"`
 	SortField    []string `json:"sort_field,omitempty"`
 	SortOrder    []string `json:"sort_order,omitempty"` //粉丝数,实际带货销量,近30天销量,累计合作次数
-	Platform     *string  `json:"platform,omitempty"`
+	Platform     int      `json:"platform"`
 	TalentName   string   `json:"talent_name"`
 	EnterpriseId string   `json:"enterprise_id"`
 }