修改违约

db/default.go

@@ -206,13 +206,33 @@ func ContractBreach(ctx context.Context, req *http_model.ContractBreachRequest)
 
 			db4 := GetReadDB(ctx)
 			if breakType == 1 {
-				err = db4.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskId).Updates(gorm_model.YoungeeTaskInfo{CurDefaultType: 2, TaskStage: 16}).Error
+				err = db4.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskId).Updates(
+					map[string]interface{}{
+						"cur_default_type":  2,
+						"task_stage":        16,
+						"script_break_rate": 0}).Error
+				taskInfo.ScriptBreakRate = 0
 			} else if breakType == 2 {
-				err = db4.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskId).Updates(gorm_model.YoungeeTaskInfo{CurDefaultType: 4, TaskStage: 16}).Error
+				err = db4.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskId).Updates(
+					map[string]interface{}{
+						"cur_default_type":  4,
+						"task_stage":        16,
+						"sketch_break_rate": 0}).Error
+				taskInfo.SketchBreakRate = 0
 			} else if breakType == 3 {
-				err = db4.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskId).Updates(gorm_model.YoungeeTaskInfo{CurDefaultType: 6, TaskStage: 16}).Error
+				err = db4.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskId).Updates(
+					map[string]interface{}{
+						"cur_default_type": 6,
+						"task_stage":       16,
+						"link_break_rate":  0}).Error
+				taskInfo.LinkBreakRate = 0
 			} else if breakType == 4 {
-				err = db4.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskId).Updates(gorm_model.YoungeeTaskInfo{CurDefaultType: 8, TaskStage: 16}).Error
+				err = db4.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskId).Updates(
+					map[string]interface{}{
+						"cur_default_type": 8,
+						"task_stage":       16,
+						"data_break_rate":  0}).Error
+				taskInfo.DataBreakRate = 0
 			}
 			if err != nil {
 				logrus.WithContext(ctx).Errorf("[BreachPending] error update YoungeeTaskInfo, err:%+v", err)
@@ -220,10 +240,11 @@ func ContractBreach(ctx context.Context, req *http_model.ContractBreachRequest)
 			}
 			settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.LinkBreakRate+taskInfo.DataBreakRate+taskInfo.SketchBreakRate+taskInfo.ScriptBreakRate+taskInfo.ErrBreakRate)/100)
 			if settleAmount <= 0 {
-				settleAmount = float64(0.01)
+				settleAmount = 0.0
 			}
 			db5 := GetReadDB(ctx)
-			err = db5.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskId).Updates(gorm_model.YoungeeTaskInfo{SettleAmount: settleAmount}).Error
+			err = db5.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskId).Updates(
+				map[string]interface{}{"settle_amount": 0}).Error
 			if err != nil {
 				logrus.WithContext(ctx).Errorf("[BreachPending] error update YoungeeTaskInfo, err:%+v", err)
 				return err
@@ -383,7 +404,7 @@ func BreachHandled(ctx context.Context, pageSize, pageNum int32, req *http_model
 		BreachHandledPreview := new(http_model.BreachHandledPreview)
 		BreachHandledPreview.ContractId = int32(contractInfo.ContractID)
 		BreachHandledPreview.ProjectId = taskIdToProjectMap[contractInfo.TaskID]
-		BreachHandledPreview.UserId = int32(enterpriseIdToUserId[projectIdToProjectInfoMap[taskIdToProjectMap[contractInfo.TaskID]].EnterpriseID])
+		BreachHandledPreview.UserId = projectIdToProjectInfoMap[taskIdToProjectMap[contractInfo.TaskID]].EnterpriseID
 		BreachHandledPreview.ProjectName = projectIdToProjectInfoMap[taskIdToProjectMap[contractInfo.TaskID]].ProjectName
 		BreachHandledPreview.UserPhone = userIdToUserPhone[enterpriseIdToUserId[projectIdToProjectInfoMap[taskIdToProjectMap[contractInfo.TaskID]].EnterpriseID]]
 		BreachHandledPreview.TaskId = contractInfo.TaskID

db/operate.go

@@ -1172,15 +1172,21 @@ func GetAutoDraftDefaultInMvTask() error {
 			}
 			settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.LinkBreakRate+taskInfo.DataBreakRate+sketchDefaultRate+taskInfo.ScriptBreakRate)/100)
 			if settleAmount <= 0 {
-				settleAmount = 0.01
+				settleAmount = 0.0
 			}
 			realPayment := taskInfo.AllPayment * (1.0 - float64(sketchErrRate)/100)
 			if realPayment <= 0 {
-				realPayment = float64(0.01)
+				realPayment = 0.0
 			}
 			db3 := GetReadDB(context.Background())
 			err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", videoTaskNeedModId).Updates(
-				&gorm_model.YoungeeTaskInfo{CurDefaultType: 3, SketchBreakRate: sketchDefaultRate, SettleAmount: settleAmount, ErrBreakRate: sketchErrRate, RealPayment: realPayment}).Error
+				map[string]interface{}{
+					"cur_default_type":  3,
+					"sketch_break_rate": sketchDefaultRate,
+					"settle_amount":     settleAmount,
+					"err_break_rate":    sketchErrRate,
+					"real_payment":      realPayment,
+				}).Error
 			if err2 != nil {
 				return err2
 			}
@@ -1246,15 +1252,21 @@ func GetAutoDraftDefaultInMvTask() error {
 			}
 			settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.LinkBreakRate+taskInfo.DataBreakRate+sketchDefaultRate+taskInfo.ScriptBreakRate)/100)
 			if settleAmount <= 0 {
-				settleAmount = 0.01
+				settleAmount = 0.0
 			}
 			realPayment := taskInfo.AllPayment * (1.0 - float64(sketchErrRate)/100)
 			if realPayment <= 0 {
-				realPayment = float64(0.01)
+				realPayment = 0.0
 			}
 			db3 := GetReadDB(context.Background())
 			err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", submitVideoTaskNeedModId).Updates(
-				&gorm_model.YoungeeTaskInfo{CurDefaultType: 3, SketchBreakRate: sketchDefaultRate, SettleAmount: settleAmount, ErrBreakRate: sketchErrRate, RealPayment: realPayment}).Error
+				map[string]interface{}{
+					"cur_default_type":  3,
+					"sketch_break_rate": sketchDefaultRate,
+					"settle_amount":     settleAmount,
+					"err_break_rate":    sketchErrRate,
+					"real_payment":      realPayment,
+				}).Error
 			if err2 != nil {
 				return err2
 			}
@@ -1406,16 +1418,22 @@ func GetAutoScriptDefaultTask() error {
 				}
 				settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.SketchBreakRate+taskInfo.DataBreakRate+taskInfo.LinkBreakRate+scriptDefaultRate)/100)
 				if settleAmount <= 0 {
-					settleAmount = 0.01
+					settleAmount = 0.0
 				}
 				realPayment := taskInfo.AllPayment * (1.0 - float64(scriptErrRate)/100)
 				if realPayment <= 0 {
-					realPayment = float64(0.01)
+					realPayment = 0.0
 				}
 				fmt.Printf("脚本未上传扣款率： %+v\nrealPayment：%+v\n", scriptErrRate, realPayment)
 				db3 := GetReadDB(context.Background())
 				err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", videoTaskNeedModId).Updates(
-					&gorm_model.YoungeeTaskInfo{CurDefaultType: 1, ScriptBreakRate: scriptDefaultRate, SettleAmount: settleAmount, ErrBreakRate: scriptErrRate, RealPayment: realPayment}).Error
+					map[string]interface{}{
+						"cur_default_type":  1,
+						"script_break_rate": scriptDefaultRate,
+						"settle_amount":     settleAmount,
+						"err_break_rate":    scriptErrRate,
+						"real_payment":      realPayment,
+					}).Error
 				if err2 != nil {
 					return err2
 				}
@@ -1479,15 +1497,21 @@ func GetAutoScriptDefaultTask() error {
 				}
 				settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.SketchBreakRate+taskInfo.DataBreakRate+taskInfo.LinkBreakRate+scriptDefaultRate)/100)
 				if settleAmount <= 0 {
-					settleAmount = 0.01
+					settleAmount = 0.0
 				}
 				realPayment := taskInfo.AllPayment * (1.0 - float64(scriptErrRate)/100)
 				if realPayment <= 0 {
-					realPayment = float64(0.01)
+					realPayment = 0.0
 				}
 				db3 := GetReadDB(context.Background())
-				err3 := db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", submitVideoTaskNeedModId).Updates(&gorm_model.YoungeeTaskInfo{
-					CurDefaultType: 1, ScriptBreakRate: scriptDefaultRate, SettleAmount: settleAmount, ErrBreakRate: scriptErrRate, RealPayment: realPayment}).Error
+				err3 := db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", submitVideoTaskNeedModId).Updates(
+					map[string]interface{}{
+						"cur_default_type":  1,
+						"script_break_rate": scriptDefaultRate,
+						"settle_amount":     settleAmount,
+						"err_break_rate":    scriptErrRate,
+						"real_payment":      realPayment,
+					}).Error
 				if err3 != nil {
 					return err3
 				}
@@ -1637,15 +1661,21 @@ func GetAutoLinkBreachTask() error {
 				}
 				settleAmount := taskInfo.TaskReward * (1.0 - float64(linkDefaultRate+taskInfo.DataBreakRate+taskInfo.SketchBreakRate+taskInfo.ScriptBreakRate)/100)
 				if settleAmount <= 0 {
-					settleAmount = 0.01
+					settleAmount = 0.0
 				}
 				realPayment := taskInfo.AllPayment * (1.0 - float64(linkErrRate)/100)
 				if realPayment <= 0 {
-					realPayment = float64(0.01)
+					realPayment = 0.0
 				}
 				db3 := GetReadDB(context.Background())
 				err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskNeedModId).Updates(
-					&gorm_model.YoungeeTaskInfo{CurDefaultType: 5, LinkBreakRate: linkDefaultRate, SettleAmount: settleAmount, ErrBreakRate: linkErrRate, RealPayment: realPayment}).Error
+					map[string]interface{}{
+						"cur_default_type": 5,
+						"link_break_rate":  linkDefaultRate,
+						"settle_amount":    settleAmount,
+						"err_break_rate":   linkErrRate,
+						"real_payment":     realPayment,
+					}).Error
 				if err2 != nil {
 					return err2
 				}
@@ -1675,15 +1705,21 @@ func GetAutoLinkBreachTask() error {
 				}
 				settleAmount := taskInfo.TaskReward * (1.0 - float64(linkDefaultRate+taskInfo.DataBreakRate+taskInfo.SketchBreakRate+taskInfo.ScriptBreakRate)/100)
 				if settleAmount <= 0 {
-					settleAmount = 0.01
+					settleAmount = 0.0
 				}
 				realPayment := taskInfo.AllPayment * (1.0 - float64(linkErrRate)/100)
 				if realPayment <= 0 {
-					realPayment = float64(0.01)
+					realPayment = 0.0
 				}
 				db3 := GetReadDB(context.Background())
 				err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskNeedModId).Updates(
-					&gorm_model.YoungeeTaskInfo{CurDefaultType: 5, LinkBreakRate: linkDefaultRate, SettleAmount: settleAmount, ErrBreakRate: linkErrRate, RealPayment: realPayment}).Error
+					map[string]interface{}{
+						"cur_default_type": 5,
+						"link_break_rate":  linkDefaultRate,
+						"settle_amount":    settleAmount,
+						"err_break_rate":   linkErrRate,
+						"real_payment":     realPayment,
+					}).Error
 				if err2 != nil {
 					return err2
 				}
@@ -1747,15 +1783,21 @@ func GetAutoLinkBreachTask() error {
 				}
 				settleAmount := taskInfo.TaskReward * (1.0 - float64(linkDefaultRate+taskInfo.DataBreakRate+taskInfo.SketchBreakRate+taskInfo.ScriptBreakRate)/100)
 				if settleAmount <= 0 {
-					settleAmount = 0.01
+					settleAmount = 0.0
 				}
 				realPayment := taskInfo.AllPayment * (1.0 - float64(linkErrRate)/100)
 				if realPayment <= 0 {
-					realPayment = float64(0.01)
+					realPayment = 0.0
 				}
 				db3 := GetReadDB(context.Background())
 				err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", submitTaskNeedModId).Updates(
-					&gorm_model.YoungeeTaskInfo{CurDefaultType: 5, LinkBreakRate: linkDefaultRate, SettleAmount: settleAmount, ErrBreakRate: linkErrRate, RealPayment: realPayment}).Error
+					map[string]interface{}{
+						"cur_default_type": 5,
+						"link_break_rate":  linkDefaultRate,
+						"settle_amount":    settleAmount,
+						"err_break_rate":   linkErrRate,
+						"real_payment":     realPayment,
+					}).Error
 				if err2 != nil {
 					return err2
 				}
@@ -1906,15 +1948,21 @@ func GetAutoCaseCloseDefaultTask() error {
 				}
 				settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.SketchBreakRate+dataDefaultRate+taskInfo.LinkBreakRate+taskInfo.ScriptBreakRate)/100)
 				if settleAmount <= 0 {
-					settleAmount = 0.01
+					settleAmount = 0.0
 				}
 				realPayment := taskInfo.AllPayment * (1.0 - float64(dataErrRate)/100)
 				if realPayment <= 0 {
-					realPayment = float64(0.01)
+					realPayment = 0.0
 				}
 				db3 := GetReadDB(context.Background())
 				err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskNeedModId).Updates(
-					&gorm_model.YoungeeTaskInfo{CurDefaultType: 7, DataBreakRate: dataDefaultRate, SettleAmount: settleAmount, ErrBreakRate: dataErrRate, RealPayment: realPayment}).Error
+					map[string]interface{}{
+						"cur_default_type": 7,
+						"data_break_rate":  dataDefaultRate,
+						"settle_amount":    settleAmount,
+						"err_break_rate":   dataErrRate,
+						"real_payment":     realPayment,
+					}).Error
 				if err2 != nil {
 					return err2
 				}
@@ -2017,15 +2065,21 @@ func GetAutoCaseCloseDefaultTask() error {
 				}
 				settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.SketchBreakRate+dataDefaultRate+taskInfo.LinkBreakRate+taskInfo.ScriptBreakRate)/100)
 				if settleAmount <= 0 {
-					settleAmount = 0.01
+					settleAmount = 0.0
 				}
 				realPayment := taskInfo.AllPayment * (1.0 - float64(dataErrRate)/100)
 				if realPayment <= 0 {
-					realPayment = float64(0.01)
+					realPayment = 0.0
 				}
 				db3 := GetReadDB(context.Background())
 				err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", submitTaskNeedModId).Updates(
-					&gorm_model.YoungeeTaskInfo{CurDefaultType: 7, DataBreakRate: dataDefaultRate, SettleAmount: settleAmount, ErrBreakRate: dataErrRate, RealPayment: realPayment}).Error
+					map[string]interface{}{
+						"cur_default_type": 7,
+						"data_break_rate":  dataDefaultRate,
+						"settle_amount":    settleAmount,
+						"err_break_rate":   dataErrRate,
+						"real_payment":     realPayment,
+					}).Error
 				if err2 != nil {
 					return err2
 				}
@@ -2055,15 +2109,21 @@ func GetAutoCaseCloseDefaultTask() error {
 				}
 				settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.SketchBreakRate+dataDefaultRate+taskInfo.LinkBreakRate+taskInfo.ScriptBreakRate)/100)
 				if settleAmount <= 0 {
-					settleAmount = 0.01
+					settleAmount = 0.0
 				}
 				realPayment := taskInfo.AllPayment * (1.0 - float64(dataErrRate)/100)
 				if realPayment <= 0 {
-					realPayment = float64(0.01)
+					realPayment = 0.0
 				}
 				db3 := GetReadDB(context.Background())
 				err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", submitTaskNeedModId).Updates(
-					&gorm_model.YoungeeTaskInfo{CurDefaultType: 7, DataBreakRate: dataDefaultRate, SettleAmount: settleAmount, ErrBreakRate: dataErrRate, RealPayment: realPayment}).Error
+					map[string]interface{}{
+						"cur_default_type": 7,
+						"data_break_rate":  dataDefaultRate,
+						"settle_amount":    settleAmount,
+						"err_break_rate":   dataErrRate,
+						"real_payment":     realPayment,
+					}).Error
 				if err2 != nil {
 					return err2
 				}

db/task.go

@@ -98,11 +98,22 @@ func ChangeSpecialTaskStatus(ctx context.Context, taskIds []string, taskStatus s
 		logrus.WithContext(ctx).Errorf("[ChangeTaskStatus]1 error query mysql total, err:%+v", err)
 		return err
 	}
-	if err := db.Debug().Model(&gorm_model.YoungeeTaskInfo{}).Where("task_id IN ?", taskIds).
-		Updates(gorm_model.YoungeeTaskInfo{TaskStatus: status, TaskStage: stage, SelectDate: time.Now()}).Error; err != nil {
-		logrus.WithContext(ctx).Errorf("[ChangeTaskStatus]2 error query mysql total, err:%+v", err)
+	err = db.Transaction(func(tx *gorm.DB) error {
+		if err := tx.Debug().Model(&gorm_model.YoungeeTaskInfo{}).Where("task_id IN ?", taskIds).
+			Updates(gorm_model.YoungeeTaskInfo{TaskStatus: status, TaskStage: stage, SelectDate: time.Now()}).Error; err != nil {
+			logrus.WithContext(ctx).Errorf("[ChangeTaskStatus]2 error query mysql total, err:%+v", err)
+			return err
+		}
+		return nil
+	})
+	if err != nil {
 		return err
 	}
+	//if err := db.Debug().Model(&gorm_model.YoungeeTaskInfo{}).Where("task_id IN ?", taskIds).
+	//	Updates(gorm_model.YoungeeTaskInfo{TaskStatus: status, TaskStage: stage, SelectDate: time.Now()}).Error; err != nil {
+	//	logrus.WithContext(ctx).Errorf("[ChangeTaskStatus]2 error query mysql total, err:%+v", err)
+	//	return err
+	//}
 	return nil
 }
 

db/terminate.go

@@ -15,11 +15,19 @@ import (
 // Terminate 批量提交解约申请
 func Terminate(ctx context.Context, TaskIDs []string, projectIds []string) error {
 	db := GetReadDB(ctx)
-	err := db.Model(gorm_model.YoungeeContractInfo{}).Where("task_id in ?  and (default_status = 1 or default_status = 4)", TaskIDs).Updates(map[string]interface{}{"default_status": 3, "terminate_at": time.Now()}).Error
+	err := db.Model(gorm_model.YoungeeContractInfo{}).Where("task_id in ?  and (default_status = 1 or default_status = 4)", TaskIDs).
+		Updates(map[string]interface{}{"default_status": 3, "terminate_at": time.Now()}).Error
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Data db] Update YoungeeContractInfo error,err:%+v", err)
 		return err
 	}
+	dbc := GetReadDB(ctx)
+	errCurDef := dbc.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id in ?", TaskIDs).
+		Updates(map[string]interface{}{"cur_default_type": 9}).Error
+	if errCurDef != nil {
+		logrus.WithContext(ctx).Errorf("[Data db] Update YoungeeTaskInfo error,err:%+v", errCurDef)
+		return errCurDef
+	}
 	projectIds = util.RemoveStrRepByMap(projectIds)
 	var unfinishedNum int64
 	for _, projectId := range projectIds {

main.go

@@ -13,6 +13,33 @@ func main() {
 	r := gin.Default()
 	route.InitRoute(r)
 	config := config.Init()
+
+	//s := &http.Server{
+	//	Addr:           fmt.Sprintf(":%d", config.Port),
+	//	Handler:        r,
+	//	MaxHeaderBytes: 1 << 20,
+	//}
+	//
+	//go func() {
+	//	if err := s.ListenAndServe(); err != nil {
+	//		log.Printf("Listen: %s\n", err)
+	//	}
+	//}()
+	//
+	//quit := make(chan os.Signal)
+	//signal.Notify(quit, os.Interrupt)
+	//<-quit
+	//
+	//log.Println("Shutdown Server ...")
+	//
+	//ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	//defer cancel()
+	//if err := s.Shutdown(ctx); err != nil {
+	//	log.Fatal("Server Shutdown:", err)
+	//}
+	//
+	//log.Println("Server exiting")
+
 	addr := fmt.Sprintf("%v:%v", config.Host, config.Port)
 	err := service.AutoTask()
 	if err != nil {

model/http_model/breach_handled.go

@@ -12,7 +12,7 @@ type BreachHandledRequest struct {
 type BreachHandledPreview 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"`

pack/operate.go

@@ -1,13 +1,12 @@
 package pack
 
 import (
+	"github.com/caixw/lib.go/conv"
 	"youngee_m_api/consts"
 	"youngee_m_api/model/common_model"
 	"youngee_m_api/model/gorm_model"
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/util"
-
-	"github.com/caixw/lib.go/conv"
 )
 
 func HttpPricingRequestToConditions(req *http_model.SearchPricingRequest) *common_model.PricingConditions {
@@ -33,15 +32,16 @@ func MGromSearchPricingDataToHttpData(gormPricing *gorm_model.InfoPricingStrateg
 	updatedTime := conv.MustString(gormPricing.UpdateAt, "")
 	updatedTime = updatedTime[0:19]
 	fans := ""
-	if gormPricing.FansLow == 0 && gormPricing.FansUp == 0 {
-		fans = "不限"
-	} else if gormPricing.FansLow == 0 && gormPricing.FansUp != 0 {
-		fans = util.GetNumString(gormPricing.FansUp) + "以下"
-	} else if gormPricing.FansLow != 0 && gormPricing.FansUp != 0 {
-		fans = util.GetNumString(gormPricing.FansLow) + "-" + util.GetNumString(gormPricing.FansUp)
-	} else if gormPricing.FansLow != 0 && gormPricing.FansUp == 0 {
-		fans = util.GetNumString(gormPricing.FansLow) + "以上"
-	}
+	//if gormPricing.FansLow == 0 && gormPricing.FansUp == 0 {
+	//	fans = "不限"
+	//} else if gormPricing.FansLow == 0 && gormPricing.FansUp != 0 {
+	//	fans = util.GetNumString(gormPricing.FansUp) + "以下"
+	//} else if gormPricing.FansLow != 0 && gormPricing.FansUp != 0 {
+	//	fans = util.GetNumString(gormPricing.FansLow) + "-" + util.GetNumString(gormPricing.FansUp)
+	//} else if gormPricing.FansLow != 0 && gormPricing.FansUp == 0 {
+	//	fans = util.GetNumString(gormPricing.FansLow) + "以上"
+	//}
+	fans = util.GetNumString(gormPricing.FansLow) + "-" + util.GetNumString(gormPricing.FansUp)
 	serviceCharge := ""
 	if gormPricing.ServiceCharge == 0 {
 		serviceCharge = "不限"

route/init.go

@@ -135,7 +135,7 @@ func InitRoute(r *gin.Engine) {
 		o.POST("/caseCloseDefault", operate.WrapCaseCloseDefaultHandler)
 		o.GET("/countNumOfDefaults", operate.WrapCountNumOfDefaultsHandler)
 		o.POST("/breachPending", operate.WrapBreachPendingHandler)
-		o.POST("/contractBreach", operate.WrapContractBreachHandler)
+		o.POST("/contractBreach", operate.WrapContractBreachHandler) // 解约
 		o.POST("/getSketchInfoByTaskId", operate.WrapGetSketchInfoByTaskIdHandler)
 		o.POST("/breachHandled", operate.WrapBreachHandledHandler)
 		o.POST("/sketchReplaceNotUpload", operate.WrapSketchReplaceNotUploadHandler)