0923bug修改

db/product.go

@@ -2,7 +2,6 @@ package db
 
 import (
 	"context"
-	"fmt"
 	"github.com/sirupsen/logrus"
 	"youngee_b_api/consts"
 	"youngee_b_api/model/gorm_model"
@@ -105,8 +104,7 @@ func GetAllProduct(ctx context.Context, req *http_model.GetAllProductRequest, en
 	var ProjectBriefInfos []*http_model.ProjectBriefInfo
 	db := GetReadDB(ctx)
 	var projectInfos []*gorm_model.ProjectInfo
-	fmt.Printf("请求试探", req.Platform)
-	db = db.Debug().Model(gorm_model.ProjectInfo{}).Where("enterprise_id = ?", enterpriseID)
+	db = db.Debug().Model(gorm_model.ProjectInfo{}).Where("project_status>2")
 	if req.Platform != 0 {
 		db = db.Model(gorm_model.ProjectInfo{}).Where("project_platform = ?", req.Platform)
 	}

db/selection.go

@@ -250,7 +250,7 @@ func UpdateSelectionSettleMoney(ctx context.Context, selectionID string, payMone
 
 func GetSelectionInfoList(ctx context.Context, pageNum, pageSize int64, conditions http_model.SelectionSquareCondition) ([]*http_model.SelectionBriefInfo, int64, error) {
 	db := GetReadDB(ctx)
-	db = db.Debug().Model(gorm_model.YounggeeSelectionInfo{})
+	db = db.Debug().Model(gorm_model.YounggeeSelectionInfo{}).Where("selection_status>2")
 
 	conditionType := reflect.TypeOf(&conditions).Elem()
 	conditionValue := reflect.ValueOf(&conditions).Elem()

model/gorm_model/selection_info.go

@@ -19,7 +19,7 @@ type YounggeeSelectionInfo struct {
 	ProductUrl       string    `gorm:"column:product_url"`              // 带货链接
 	SampleNum        int       `gorm:"column:sample_num"`               // 样品数量
 	RemainNum        int       `gorm:"column:remain_num"`               // 剩余数量
-	CommissionRate   int       `gorm:"column:commission_rate"`          // 佣金比例
+	CommissionRate   float64       `gorm:"column:commission_rate"`          // 佣金比例
 	EstimatedCost    string    `gorm:"column:estimated_cost"`           // 预估成本
 	TaskReward       string    `gorm:"column:task_reward"`              // 任务悬赏
 	SampleCondition  string    `gorm:"column:sample_condition"`         // 领样条件

model/http_model/AllSelectionHandler.go

@@ -22,7 +22,7 @@ type SelectionBriefInfo struct {
 	Platform        int     `json:"platform"`         // 社媒平台，1-7分别表示小红书、抖音、微博、快手、b站、大众点评、知乎
 	EstimatedIncome float64 `json:"estimated_income"` // 预估赚金额，计算方式：商品售价×佣金比例
 	ProductPrice    float64 `json:"product_price"`    // 售价
-	CommissionRate  int     `json:"commission_rate"`  // 佣金比例，百分之
+	CommissionRate  float64 `json:"commission_rate"`  // 佣金比例，百分之
 	TaskReward      float64 `json:"task_reward"`      // 额外悬赏
 	SampleMode      int     `json:"sample_mode"`      // 领样形式，1、2、3分别表示免费领样、垫付领样、不提供样品
 	TaskMode        int     `json:"task_mode"`        // 任务形式，1、2分别表示悬赏任务、纯佣带货

model/http_model/UpdateSelection.go

@@ -12,7 +12,7 @@ type UpdateSelectionRequest struct {
 	TaskReward       float64           `json:"task_reward"` // 任务悬赏
 	TaskDdl          string            `json:"task_ddl"`
 	SampleMode       int               `json:"sample_mode"`
-	CommissionRate   int               `json:"commission_rate"`
+	CommissionRate   float64           `json:"commission_rate"`
 	ProductUrl       string            `json:"product_url"`
 	SettlementAmount float64           `json:"settlement_amount"` //结算金额
 	SampleCondition  string            `json:"sample_condition"`

service/selection_service/selection.go

@@ -130,7 +130,7 @@ func (*selection) Update(ctx context.Context, request http_model.UpdateSelection
 		ProductUrl:       request.ProductUrl,
 		SampleNum:        conv.MustInt(request.SampleNum, 0),
 		RemainNum:        conv.MustInt(request.SampleNum, 0),
-		CommissionRate:   conv.MustInt(request.CommissionRate, 0),
+		CommissionRate:   conv.MustFloat64(request.CommissionRate, 0),
 		TaskReward:       conv.MustString(request.TaskReward, ""),
 		SettlementAmount: conv.MustString(request.SettlementAmount, ""),
 		EstimatedCost:    estimatedCostToString,