0225

db/info_pricing_strategy.go

@@ -11,7 +11,7 @@ import (
 func GetPricingStrategy(ctx context.Context, fansLow int64, fansUp int64, feeForm int64, platForm int64) (*gorm_model.InfoPricingStrategy, error) {
 	db := GetReadDB(ctx)
 	var PricingStrategys []gorm_model.InfoPricingStrategy
-	whereStr := fmt.Sprintf("fee_form = %d and platform = %d and fans_low <= %d and fans_up >= %d", feeForm, platForm, fansLow, fansLow)
+	whereStr := fmt.Sprintf("fee_form = %d and platform = %d and fans_low <= %d and fans_up > %d", feeForm, platForm, fansLow, fansLow)
 	orStr := fmt.Sprintf("fee_form = %d and platform = %d and fans_low <= %d and fans_up >= %d", feeForm, platForm, fansUp, fansUp)
 	orStr1 := fmt.Sprintf("fee_form = %d and platform = %d and fans_low >= %d and fans_up <= %d", feeForm, platForm, fansLow, fansUp)
 	orStr2 := fmt.Sprintf("fee_form = %d and platform = %d and fans_low <= %d and fans_up >= %d", feeForm, platForm, fansLow, fansUp)

db/operate.go

@@ -295,7 +295,7 @@ func GetSignInOfflineTask(projectForm int32) error {
 					if logisticInfo.AutoSignAt == nil || logisticInfo.AutoSignAt.IsZero() {
 						var t1 time.Time
 						if logisticInfo.ThingsType == 3 {
-							t1 = logisticInfo.SignedTime.Add(dd)
+							t1 = logisticInfo.ExplorestoreEndtime.Add(dd)
 						} else {
 							t1 = logisticInfo.DeliveryTime.Add(dd)
 						}
@@ -875,6 +875,8 @@ func GetAutoInvalidTask() error {
 					return err1
 				}
 				fmt.Println("已更新项目状态为超时未支付的失效状态")
+				dbT := GetReadDB(context.TODO())
+				dbT.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ?", projectId).Updates(gorm_model.YoungeeTaskInfo{TaskStage: 3, CompleteStatus: 3, CompleteDate: time.Now()})
 			}
 		}
 	}
@@ -906,7 +908,7 @@ func GetAutoDraftDefaultInPicTask() error {
 		db1 := GetReadDB(context.Background())
 
 		var taskInfos []gorm_model.YoungeeTaskInfo
-		db1.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? AND task_status = ? AND task_stage = ? AND cur_default_type = ?", projectId, 2, 9, 0).Find(&taskInfos)
+		db1.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? AND task_status = ? AND task_stage = ? AND cur_default_type = ? AND logistics_status = 3", projectId, 2, 9, 0).Find(&taskInfos)
 		for _, taskInfo := range taskInfos {
 			TaskIdToProjectId[taskInfo.TaskId] = projectId
 			taskNeedMod := gorm_model.YoungeeTaskInfo{}
@@ -1122,7 +1124,7 @@ func GetAutoDraftDefaultInMvTask() error {
 
 		var videoTaskInfos []*gorm_model.YoungeeTaskInfo
 		db1 := GetReadDB(context.Background())
-		db1.Model(&gorm_model.YoungeeTaskInfo{}).Where("project_id = ? AND task_status = ? AND task_stage = ? AND cur_default_type = ? ", projectInfo.ProjectID, 2, 9, 0).Find(&videoTaskInfos)
+		db1.Model(&gorm_model.YoungeeTaskInfo{}).Where("project_id = ? AND task_status = ? AND task_stage = ? AND cur_default_type = ? AND logistics_status = 3", projectInfo.ProjectID, 2, 9, 0).Find(&videoTaskInfos)
 		for _, videoTaskInfo := range videoTaskInfos {
 			taskIdToProjectIdMap[videoTaskInfo.TaskId] = projectInfo.ProjectID
 			taskIdToFeeFormMap[videoTaskInfo.TaskId] = videoTaskInfo.FeeForm
@@ -1337,7 +1339,8 @@ func GetAutoScriptDefaultTask() error {
 
 		var videoTaskInfos []*gorm_model.YoungeeTaskInfo
 		db1 := GetReadDB(context.Background())
-		db1.Model(&gorm_model.YoungeeTaskInfo{}).Where("project_id = ?  AND task_status = ? AND task_stage = ? AND cur_default_type = ? ", projectInfo.ProjectID, 2, 7, 0).Find(&videoTaskInfos)
+		db1.Model(&gorm_model.YoungeeTaskInfo{}).
+			Where("project_id = ?  AND task_status = ? AND task_stage = ? AND cur_default_type = ? AND logistics_status = 3", projectInfo.ProjectID, 2, 7, 0).Find(&videoTaskInfos)
 		for _, videoTaskInfo := range videoTaskInfos {
 			taskIdToProjectIdMap[videoTaskInfo.TaskId] = projectInfo.ProjectID
 			taskIdToFeeFormMap[videoTaskInfo.TaskId] = videoTaskInfo.FeeForm

model/http_model/get_sketch_info.go

@@ -1,7 +1,7 @@
 package http_model
 
 type GetSketchInfoByTaskIdRequest struct {
-	TaskId int32 `json:"task_id"`
+	TaskId string `json:"task_id"`
 }
 
 type SketchInfoResponse struct {

service/project_pay.go

@@ -37,7 +37,7 @@ func (*projectPay) Pay(ctx context.Context, projectPay http_model.ProjectPayRequ
 	}
 
 	// 支付更新任务状态
-	project, err2 := db.GetProjectDetail(ctx, projectPay.ProjectID)
+	_, err2 := db.GetProjectDetail(ctx, projectPay.ProjectID)
 	if err2 != nil {
 		logrus.WithContext(ctx).Errorf("[project service] call GetPorjectDetail error,err:%+v", err)
 		return nil, err2
@@ -47,27 +47,10 @@ func (*projectPay) Pay(ctx context.Context, projectPay http_model.ProjectPayRequ
 		logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
 		return nil, err
 	}
-
-	if project.ProjectForm != 4 {
-		err = db.UpdateTaskStageByProjectId(ctx, projectPay.ProjectID, 2, 4)
-		if err != nil {
-			logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
-			return nil, err
-		}
-	} else {
-		if project.ContentType == 1 {
-			err = db.UpdateTaskStageByProjectId(ctx, projectPay.ProjectID, 2, 9) //修改为待传初稿
-			if err != nil {
-				logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
-				return nil, err
-			}
-		} else {
-			err = db.UpdateTaskStageByProjectId(ctx, projectPay.ProjectID, 2, 7) //修改为待传脚本
-			if err != nil {
-				logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
-				return nil, err
-			}
-		}
+	err = db.UpdateTaskStageByProjectId(ctx, projectPay.ProjectID, 2, 4)
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
+		return nil, err
 	}
 
 	// 插入消息-任务申请成功