招募策略sql修改

model/gorm_model/recruit_strategy.go

@@ -1,22 +1,34 @@
 // Code generated by sql2gorm. DO NOT EDIT.
 package gorm_model
 
+
 type RecruitStrategy struct {
-	RecruitStrategyID int64 `gorm:"column:recruit_strategy_id;primary_key;AUTO_INCREMENT"` // 招募策略id
-	FeeForm           int64 `gorm:"column:fee_form"`                                       // 稿费形式，1-3分别代表产品置换、固定稿费、自报价
-	StrategyID        int64 `gorm:"column:strategy_id"`                                    // 策略id
-	FollowersLow      int64 `gorm:"column:followers_low"`                                  // 达人粉丝数下限
-	FollowersUp       int64 `gorm:"column:followers_up"`                                   // 达人粉丝数上限
-	RecruitNumber     int64 `gorm:"column:recruit_number"`                                 // 招募数量
-	Offer             int64 `gorm:"column:offer"`                                          // 报价
-	ProjectID         int64 `gorm:"column:project_id"`                                     // 所属项目id
-	ServiceCharge     int64 `gorm:"column:service_charge"`                                 // 平台服务费，稿费形式为产品置换时必填
-	SelectedNumber    int64 `gorm:"column:selected_number"`                                // 已选数量，被企业选择的达人数量 应发货
-	WaitingNumber     int64 `gorm:"column:waiting_number"`                                 // 待发货
-	DeliveredNumber   int64 `gorm:"column:delivered_number"`                               // 已发货
-	SignedNumber      int64 `gorm:"column:signed_number"`                                  // 已签收
+	RecruitStrategyID int64    `gorm:"column:recruit_strategy_id;primary_key;AUTO_INCREMENT"` // 招募策略id
+	FeeForm           int64    `gorm:"column:fee_form"`                                       // 稿费形式，1-3分别代表产品置换、固定稿费、自报价
+	StrategyID        int64    `gorm:"column:strategy_id"`                                    // 策略id
+	FollowersLow      int64    `gorm:"column:followers_low"`                                  // 达人粉丝数下限
+	FollowersUp       int64    `gorm:"column:followers_up"`                                   // 达人粉丝数上限
+	RecruitNumber     int64    `gorm:"column:recruit_number"`                                 // 招募数量
+	Offer             float64 `gorm:"column:offer"`                                          // 报价
+	TOffer            float64 `gorm:"column:t_offer"`                                        // 达人所见报价
+	ProjectID         int64    `gorm:"column:project_id"`                                     // 所属项目id
+	ServiceCharge     int64    `gorm:"column:service_charge"`                                 // 平台服务费，稿费形式为产品置换时必填
+	SelectedNumber    int64    `gorm:"column:selected_number;default:0"`                      // 已选数量，被企业选择的达人数量
+	WaitingNumber     int64    `gorm:"column:waiting_number;default:0"`                       // 待发货
+	DeliveredNumber   int64    `gorm:"column:delivered_number;default:0"`                     // 已发货
+	SignedNumber      int64    `gorm:"column:signed_number;default:0"`                        // 已签收
+	MaxOffer          int64    `gorm:"column:max_offer;default:0"`                            // 报价上限
+	MinOffer          int64    `gorm:"column:min_offer;default:0"`                            // 报价下限
+	FanNumber         int64    `gorm:"column:fan_number;default:0"`                           // 总粉丝量
+	PlayNumber        int64    `gorm:"column:play_number;default:0"`                          // 总播放量
+	LikeNumber        int64    `gorm:"column:like_number;default:0"`                          // 总点赞数
+	CollectNumber     int64    `gorm:"column:collect_number;default:0"`                       // 总收藏量
+	CommentNumber     int64    `gorm:"column:comment_number;default:0"`                       // 总评论数
+	FinishNumber      int64    `gorm:"column:finish_number;default:0"`                        // 结案数量
+	TotalOffer        int64    `gorm:"column:total_offer;default:0"`                          // 支付合计
 }
 
 func (m *RecruitStrategy) TableName() string {
 	return "recruit_strategy"
 }
+

model/http_model/project_create.go

@@ -8,12 +8,13 @@ type CreateProjectPhoto struct {
 }
 
 type CreateRecruitStrategy struct {
-	FeeForm       int64 `json:"fee_form"`       // 稿费形式，1-3分别代表自报价、固定稿费、产品置换
-	StrategyID    int64 `json:"strategy_id"`    // 策略id
-	FollowersLow  int64 `json:"followers_low"`  // 达人粉丝数下限
-	FollowersUp   int64 `json:"followers_up"`   // 达人粉丝数上限
-	RecruitNumber int64 `json:"recruit_number"` // 招募数量
-	Offer         int64 `json:"offer"`          // 报价
+	FeeForm       int64   `json:"fee_form"`       // 稿费形式，1-3分别代表自报价、固定稿费、产品置换
+	StrategyID    int64   `json:"strategy_id"`    // 策略id
+	FollowersLow  int64   `json:"followers_low"`  // 达人粉丝数下限
+	FollowersUp   int64   `json:"followers_up"`   // 达人粉丝数上限
+	RecruitNumber int64   `json:"recruit_number"` // 招募数量
+	Offer         float64 `json:"offer"`          // 报价
+	TOffer        float64 `json:"t_offer"`        // 达人端报价
 }
 
 type CreateProjectRequest struct {

model/http_model/project_update.go

@@ -8,12 +8,13 @@ type UpdateProjectPhoto struct {
 }
 
 type UpdateRecruitStrategy struct {
-	FeeForm       int64 `json:"fee_form"`       // 稿费形式，1-3分别代表自报价、固定稿费、产品置换
-	StrategyID    int64 `json:"strategy_id"`    // 策略id
-	FollowersLow  int64 `json:"followers_low"`  // 达人粉丝数下限
-	FollowersUp   int64 `json:"followers_up"`   // 达人粉丝数上限
-	RecruitNumber int64 `json:"recruit_number"` // 招募数量
-	Offer         int64 `json:"offer"`          // 报价
+	FeeForm       int64   `json:"fee_form"`       // 稿费形式，1-3分别代表自报价、固定稿费、产品置换
+	StrategyID    int64   `json:"strategy_id"`    // 策略id
+	FollowersLow  int64   `json:"followers_low"`  // 达人粉丝数下限
+	FollowersUp   int64   `json:"followers_up"`   // 达人粉丝数上限
+	RecruitNumber int64   `json:"recruit_number"` // 招募数量
+	Offer         float64 `json:"offer"`          // 报价
+	TOffer        float64 `json:"t_offer"`        // 报价
 }
 
 type UpdateProjectRequest struct {

service/auto_task.go

@@ -2,12 +2,13 @@ package service
 
 import (
 	"context"
-	"github.com/robfig/cron/v3"
-	"github.com/sirupsen/logrus"
 	"log"
 	"time"
 	"youngee_m_api/db"
 	"youngee_m_api/model/gorm_model"
+
+	"github.com/robfig/cron/v3"
+	"github.com/sirupsen/logrus"
 )
 
 func AutoTask() error {
@@ -185,9 +186,10 @@ func AutoTask() error {
 		log.Println("GetAutoCaseCloseDefaultTask is running ,Time :", time.Now())
 	}
 	//定时任务
-	//spec := "*/10 * * * * ?" //cron表达式，每10秒一次
-	//spec := "0 */30 * * * ?" //cron表达式，每一分钟执行一次
-	spec := "0 0 * * * *" //每小时执行
+	// spec := "*/10 * * * * ?" //cron表达式，每10秒一次
+	// spec := "0 */1 * * * ?" //cron表达式，每1分钟一次
+	spec := "0 */30 * * * ?" //cron表达式，每半小时执行一次
+	// spec := "0 0 * * * *" //每小时执行
 	// 添加定时任务,
 	_, err1 := crontab.AddFunc(spec, task1)
 	if err1 != nil {

service/project.go

@@ -3,9 +3,6 @@ package service
 import (
 	"context"
 	"fmt"
-	"github.com/caixw/lib.go/conv"
-	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
 	"strconv"
 	"strings"
 	"youngee_m_api/db"
@@ -14,6 +11,10 @@ import (
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/pack"
 	"youngee_m_api/util"
+
+	"github.com/caixw/lib.go/conv"
+	"github.com/gin-gonic/gin"
+	"github.com/sirupsen/logrus"
 )
 
 var Project *project
@@ -367,6 +368,7 @@ func (*project) Create(ctx context.Context, newProject http_model.CreateProjectR
 			FollowersUp:   strategy.FollowersUp,
 			RecruitNumber: strategy.RecruitNumber,
 			Offer:         strategy.Offer,
+			TOffer:        strategy.TOffer,
 			ProjectID:     *projectID,
 		}
 		recruitStrategys = append(recruitStrategys, recruitStrategy)
@@ -403,7 +405,7 @@ func (*project) Update(ctx context.Context, newProject http_model.UpdateProjectR
 		return nil, err
 	}
 	fmt.Printf("照片:\t %+v", newProject.ProjectPhotos)
-	if newProject.ProjectPhotos != nil {
+	if len(newProject.ProjectPhotos) != 0 {
 		// 新增图片
 		projectPhotos := []gorm_model.ProjectPhoto{}
 		for _, photo := range newProject.ProjectPhotos {
@@ -435,7 +437,8 @@ func (*project) Update(ctx context.Context, newProject http_model.UpdateProjectR
 				FollowersLow:  conv.MustInt64(Strategy.FollowersLow, 0),
 				FollowersUp:   conv.MustInt64(Strategy.FollowersUp, 0),
 				RecruitNumber: conv.MustInt64(Strategy.RecruitNumber, 0),
-				Offer:         conv.MustInt64(Strategy.Offer, 0),
+				Offer:         conv.MustFloat64(Strategy.Offer, 0),
+				TOffer:        conv.MustFloat64(Strategy.TOffer, 0),
 				ProjectID:     project.ProjectID,
 			}
 			fmt.Printf("Offer:\t %+v", Strategy.Offer)