0213

db/default.go

@@ -49,9 +49,7 @@ func BreachPending(ctx context.Context, pageSize, pageNum int32, req *http_model
 	db := GetReadDB(ctx)
 	var contractInfos []*gorm_model.YoungeeContractInfo
 	db = db.Model(gorm_model.YoungeeContractInfo{}).Where("default_status = 3")
-	if req.DefaultType == 1 || req.DefaultType == 2 {
-		db = db.Where("break_type = 1 OR break_type = 2")
-	} else {
+	if req.DefaultType != 0 {
 		db = db.Where("break_type = ?", req.DefaultType)
 	}
 	if req.TaskId != "" {
@@ -154,7 +152,7 @@ func BreachPending(ctx context.Context, pageSize, pageNum int32, req *http_model
 		BreachPendingPreview := new(http_model.BreachPendingPreview)
 		BreachPendingPreview.ContractId = int32(contractInfo.ContractID)
 		BreachPendingPreview.ProjectId = taskIdToProjectMap[contractInfo.TaskID]
-		BreachPendingPreview.UserId = int32(enterpriseIdToUserId[projectIdToProjectInfoMap[taskIdToProjectMap[contractInfo.TaskID]].EnterpriseID])
+		BreachPendingPreview.UserId = projectIdToProjectInfoMap[taskIdToProjectMap[contractInfo.TaskID]].EnterpriseID
 		BreachPendingPreview.ProjectName = projectIdToProjectInfoMap[taskIdToProjectMap[contractInfo.TaskID]].ProjectName
 		BreachPendingPreview.UserPhone = userIdToUserPhone[enterpriseIdToUserId[projectIdToProjectInfoMap[taskIdToProjectMap[contractInfo.TaskID]].EnterpriseID]]
 		BreachPendingPreview.TaskId = contractInfo.TaskID
@@ -787,16 +785,8 @@ func GetTaskTerminatedList(ctx context.Context, projectID string, pageSize, page
 		logrus.WithContext(ctx).Errorf("[GetTaskTerminatedList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
-	var misNum int64
-	if totalTerminated > totalTask {
-		misNum = totalTerminated - totalTask
-	} else {
-		misNum = totalTask - totalTerminated
-	}
-	//logrus.Println("totalTerminated,totalTalent,misNum:", totalTerminated, totalTask, misNum)
-
 	// 查询该页数据
-	limit := pageSize + misNum
+	limit := pageSize
 	offset := pageSize * pageNum // assert pageNum start with 0
 	err := db.Order("task_id").Limit(int(limit)).Offset(int(offset)).Error
 

db/info_pricing_strategy.go

@@ -9,11 +9,13 @@ import (
 )
 
 func GetPricingStrategy(ctx context.Context, fansLow int64, fansUp int64, feeForm int64, platForm int64) (*gorm_model.InfoPricingStrategy, error) {
-	db := GetReadDB(context.Background())
-	PricingStrategys := []gorm_model.InfoPricingStrategy{}
+	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)
 	orStr := fmt.Sprintf("fee_form = %d and platform = %d and fans_low <= %d and fans_up >= %d", feeForm, platForm, fansUp, fansUp)
-	err := db.Model(gorm_model.InfoPricingStrategy{}).Where(whereStr).Or(orStr).Scan(&PricingStrategys).Error
+	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)
+	err := db.Model(gorm_model.InfoPricingStrategy{}).Where(whereStr).Or(orStr).Or(orStr1).Or(orStr2).Scan(&PricingStrategys).Error
 	if err != nil {
 		log.Println("DB GetLastAutoDefaultID:", err)
 		return nil, err
@@ -22,6 +24,7 @@ func GetPricingStrategy(ctx context.Context, fansLow int64, fansUp int64, feeFor
 	if feeForm == 1 {
 		var maxCharge float64 = 0
 		for _, v := range PricingStrategys {
+			fmt.Println(v.ServiceCharge)
 			if v.ServiceCharge >= maxCharge {
 				maxCharge = v.ServiceCharge
 				PricingStrategy = v
@@ -30,12 +33,12 @@ func GetPricingStrategy(ctx context.Context, fansLow int64, fansUp int64, feeFor
 	} else {
 		var maxRate int64 = 0
 		for _, v := range PricingStrategys {
+			fmt.Println(v.ServiceRate)
 			if v.ServiceRate >= maxRate {
 				maxRate = v.ServiceRate
 				PricingStrategy = v
 			}
 		}
 	}
-	//fmt.Printf("auto task %+v %+v", result, LastTask)
 	return &PricingStrategy, nil
 }

model/http_model/breach_pending.go

@@ -11,7 +11,7 @@ type BreachPendingRequest struct {
 type BreachPendingPreview struct {
 	ContractId       int32   `json:"contract_id"`
 	ProjectId        string  `json:"project_id"`
-	UserId           int32   `json:"user_id"`
+	UserId           string  `json:"user_id"`
 	ProjectName      string  `json:"project_name"`
 	UserPhone        string  `json:"user_phone"`
 	TaskId           string  `json:"task_id"`

model/http_model/get_finish_data.go

@@ -24,6 +24,7 @@ type GetFinishDataInfo struct {
 	LikeNumber      string  `json:"like_number"`      // 总点赞数
 	CollectNumber   string  `json:"collect_number"`   // 总收藏量
 	CommentNumber   string  `json:"comment_number"`   // 总评论数
+	TerminateNumber string  `json:"terminate_number"` // 结案数量
 	FinishNumber    string  `json:"finish_number"`    // 结案数量
 	TotalOffer      float64 `json:"total_offer"`      // 支付合计
 }