db/project_task.go

@@ -454,7 +454,7 @@ func PassProTaskCoop(ctx context.Context, projectId string, taskIds []string, op
 					return err
 				}
 				projectinfo.RecruitNum += 1
-				projectinfo.NeedPay += taskInfo.SupportFee
+				projectinfo.NeedPay += taskInfo.DraftFee + taskInfo.ServiceCharge
 				err = tx.Model(gorm_model.ProjectInfo{}).Where("project_id = ? ", projectId).Updates(projectinfo).Error
 				if err != nil {
 					return err
@@ -466,7 +466,9 @@ func PassProTaskCoop(ctx context.Context, projectId string, taskIds []string, op
 					return err
 				}
 				sprojectinfo.RecruitNum += 1
-				fmt.Println("......", projectinfo.RecruitNum)
+				sprojectinfo.ServiceCharge += taskInfo.ServiceCharge
+				sprojectinfo.EstimateSupportFee += taskInfo.SupportFee
+				sprojectinfo.EstimateDraftFee += taskInfo.DraftFee
 				err = tx.Model(gorm_model.YounggeeSProjectInfo{}).Where(" s_project_id =?", taskInfo.SprojectId).Updates(sprojectinfo).Error
 				if err != nil {
 					return err
@@ -511,7 +513,7 @@ func PassProTaskCoop(ctx context.Context, projectId string, taskIds []string, op
 					return err
 				}
 				projectinfo.RecruitNum += 1
-				projectinfo.NeedPay += taskInfo.SupportFee
+				projectinfo.NeedPay += taskInfo.DraftFee + taskInfo.ServiceCharge
 				err = tx.Model(gorm_model.ProjectInfo{}).Where("project_id = ? ", projectId).Updates(projectinfo).Error
 				if err != nil {
 					return err

model/gorm_model/s_project.go

@@ -20,6 +20,8 @@ type YounggeeSProjectInfo struct {
 	ServiceCharge       float64 `gorm:"column:service_charge;type:decimal(10,2);default:0.00;comment:服务商预估可赚服务费" json:"service_charge"`
 	ServiceChargeActual float64 `gorm:"column:service_charge_actual;type:decimal(10,2);default:0.00;comment:服务商实际可赚服务费" json:"service_charge_actual"`
 	OperatorType        int     `gorm:"column:operator_type;type:int(11);default:0;comment:添加商单操作人类型，1为服务商主账号，2为服务商子账号" json:"operator_type"`
+	EstimateDraftFee    float64 `gorm:"column:estimate_draft_fee;type:decimal(10,2);comment:预估稿费" json:"estimate_draft_fee"`
+	EstimateSupportFee  float64 `gorm:"column:estimate_support_fee;type:decimal(10,2);comment:预估支持费" json:"estimate_support_fee"`
 }
 
 func (m *YounggeeSProjectInfo) TableName() string {