0204

db/auto_task.go

@@ -10,8 +10,19 @@ import (
 
 func AutoUpdateStatus() error {
 	db := GetReadDB(context.Background())
-	// 查询task表信息
-	err := db.Debug().Model(gorm_model.ProjectInfo{}).
+	// 查找所有到达招募截止时间的项目id
+	var projectIds []string
+	db = db.Debug().Model(gorm_model.ProjectInfo{}).Select("project_id").Where("project_status = 6").Find(&projectIds)
+	//fmt.Println("projectIds",projectIds)
+	if len(projectIds) != 0 {
+		for _,projectId := range projectIds{
+			db1 := GetReadDB(context.Background())
+			db1 = db1.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? and task_status = 1",projectId).Update("task_status",3)
+		}
+	}
+	db1 := GetReadDB(context.Background())
+	// 更新招募中项目状态为待支付
+	err := db1.Debug().Model(gorm_model.ProjectInfo{}).
 		Where("project_status = ? AND recruit_ddl < ?", 4, time.Now()).Update("project_status", 6).Error
 	if err != nil {
 		log.Println("DB AutoUpdateStatus error :", err)

db/logistics.go

@@ -57,7 +57,7 @@ func SignForReceipt(ctx context.Context, taskID string) error {
 func GetTaskLogisticsList(ctx context.Context, projectID string, pageSize, pageNum int64, conditions *common_model.TalentConditions) ([]*http_model.TaskLogisticsInfo, int64, error) {
 	db := GetReadDB(ctx)
 	// 查询Task表信息
-	db = db.Debug().Model(gorm_model.YoungeeTaskInfo{})
+	db = db.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("task_status = 2")
 	// 根据Project条件过滤
 	conditionType := reflect.TypeOf(conditions).Elem()
 	conditionValue := reflect.ValueOf(conditions).Elem()

db/pay_record.go

@@ -35,7 +35,7 @@ func CreatePayRecord(ctx context.Context, enterpriseId string, payment float64,
 func GetRechargeRecord(ctx context.Context, enterpriseID string, confirmAt string, method int) (*http_model.RechargeRecordPreview, error) {
 	db := GetReadDB(ctx)
 	// 根据企业id过滤
-	db = db.Debug().Model(gorm_model.YounggeeRechargeRecord{}).Where("enterprise_id = ?", enterpriseID)
+	db = db.Debug().Model(gorm_model.YounggeeRechargeRecord{}).Where("enterprise_id = ? and status = 2", enterpriseID)
 	if method == 2 {
 		db = db.Debug().Model(gorm_model.YounggeeRechargeRecord{}).Where("invoice_status = 2")
 	}

db/recruit_strategy.go

@@ -26,25 +26,16 @@ func DeleteRecruitStrategyByProjectID(ctx context.Context, projectID string) err
 	return nil
 }
 
-func CalculateSelectedNumberByRecruitStrategyID(ctx context.Context, recruitstrategyIDs []int64, AddNumber int64) error {
+func CalculateSelectedNumberByRecruitStrategyID(ctx context.Context, recruitstrategyID int64, AddNumber int64) error {
 	db := GetReadDB(ctx)
-	err := db.Model(gorm_model.RecruitStrategy{}).Where("recruit_strategy_id in ?", recruitstrategyIDs).Updates(map[string]interface{}{"selected_number": gorm.Expr("selected_number + ?", AddNumber), "waiting_number": gorm.Expr("waiting_number + ?", AddNumber)}).Error
+	err := db.Model(gorm_model.RecruitStrategy{}).Where("recruit_strategy_id = ?", recruitstrategyID).
+		Updates(map[string]interface{}{"selected_number": gorm.Expr("selected_number + ?", AddNumber), "waiting_number": gorm.Expr("waiting_number + ?", AddNumber)}).Error
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func UpdateSelectedNumber(ctx context.Context, RecruitStrategyID int64, selected_number int64) error {
-	db := GetReadDB(ctx)
-	err := db.Model(gorm_model.RecruitStrategy{}).Where("recruit_strategy_id = ?", RecruitStrategyID).Update("selected_number", gorm.Expr("selected_number + ?", selected_number)).Error
-	if err != nil {
-		logrus.WithContext(ctx).Errorf("[logistics db] call CreateLogistics error,err:%+v", err)
-		return err
-	}
-	return nil
-}
-
 func UpdateLogisticsNumber(ctx context.Context, RecruitStrategyID int64, delivered_value int64, waiting_value int64, signed_value int64) error {
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.RecruitStrategy{}).Where("recruit_strategy_id = ?", RecruitStrategyID).

model/http_model/userinfo_find.go

@@ -4,7 +4,7 @@ type FindUserInfoRequest struct {
 }
 
 type FindUserInfoData struct {
-	ID           int64  `json:"id"`            // 用户表id
+	ID           string  `json:"id"`            // 用户表id
 	Phone        string `json:"phone"`         // 绑定手机
 	Username     string `json:"username"`      // 用户名称
 	BusinessName string `json:"business_name"` // 企业名称

service/autoTask.go

@@ -1,17 +1,17 @@
 package service
 
 import (
-	"time"
-	"youngee_b_api/db"
-
 	"github.com/robfig/cron/v3"
 	log "github.com/sirupsen/logrus"
+	"time"
+	"youngee_b_api/db"
 )
 
 func AutoTask() error {
 	c := cron.New(cron.WithSeconds())
 	// spec := "0 */30 * * * ?" //cron表达式，每半小时执行一次
-	spec := "0 */1 * * * ?" //cron表达式，每1分钟一次
+	//spec := "0 */1 * * * ?" //cron表达式，每1分钟一次
+	spec := "*/10 * * * * ?" //cron表达式，每10秒一次
 	_, err1 := c.AddFunc(spec, AutoTaskUpdateStatus)
 	if err1 != nil {
 		log.Println("service [AutoTaskUpdateStatus] error:", err1)

service/project.go

@@ -445,7 +445,6 @@ func (*project) GetPorjectDetail(ctx context.Context, projectID string) (*http_m
 		AutoFailAt:       util.GetTimePoionter(project.AutoFailAt),
 	}
 	Strategys, err := db.GetRecruitStrategys(ctx, projectID)
-	//fmt.Println("招募策略：", Strategys)
 	if err != nil {
 		logrus.WithContext(ctx).Error()
 		return nil, err
@@ -501,16 +500,20 @@ func (*project) ChangeTaskStatus(ctx *gin.Context, data http_model.ProjectChange
 		return err
 	}
 	if data.TaskStatus == "2" {
-		err = db.CalculateSelectedNumberByRecruitStrategyID(ctx, RecruitStrategyIDs, 1)
-		if err != nil {
-			logrus.WithContext(ctx).Errorf("[project service] call ChangeTaskStatus error,err:%+v", err)
-			return err
+		for _, RecruitStrategyID := range RecruitStrategyIDs {
+			err = db.CalculateSelectedNumberByRecruitStrategyID(ctx, RecruitStrategyID, 1)
+			if err != nil {
+				logrus.WithContext(ctx).Errorf("[project service] call ChangeTaskStatus error,err:%+v", err)
+				return err
+			}
 		}
 	} else {
-		err = db.CalculateSelectedNumberByRecruitStrategyID(ctx, RecruitStrategyIDs, -1)
-		if err != nil {
-			logrus.WithContext(ctx).Errorf("[project service] call ChangeTaskStatus error,err:%+v", err)
-			return err
+		for _, RecruitStrategyID := range RecruitStrategyIDs {
+			err = db.CalculateSelectedNumberByRecruitStrategyID(ctx, RecruitStrategyID, -1)
+			if err != nil {
+				logrus.WithContext(ctx).Errorf("[project service] call ChangeTaskStatus error,err:%+v", err)
+				return err
+			}
 		}
 	}
 	return nil

service/sketch.go

@@ -18,7 +18,7 @@ var Sketch *sketch
 type sketch struct {
 }
 
-// ReviseOption 在上传初稿表上提交修改意见
+// SketchOption ReviseOption 在上传初稿表上提交修改意见
 func (*sketch) SketchOption(ctx context.Context, request http_model.SketchOpinionRequest) (*http_model.SketchOpinionData, error) {
 	Sketch := gorm_model.YounggeeSketchInfo{
 		TaskID:        request.TaskID,

service/user.go

@@ -38,7 +38,7 @@ func (*user) Find(ctx context.Context, EnterpriseID string, ID int64) (*http_mod
 		return nil, err
 	}
 	UserInfo := http_model.FindUserInfoData{
-		ID:           ID,
+		ID:           enterprise.EnterpriseID,
 		Username:     user.Username,
 		Email:        user.Email,
 		Phone:        user.Phone,